Add support for logging daemon messages to an SQL database.
-After applying this patch, run these commands for a successful build:
+To use this patch, run these commands for a successful build:
- autoconf
- autoheader
+ patch -p1 <patches/ODBC-dblog.diff
+ ./prepare-source
./configure --enable-ODBC
- make proto
make
-See the file "instructions" (after applying this patch) for more info.
+See the newly-created file "instructions" for more info.
---- orig/Makefile.in 2006-01-14 08:14:29
-+++ Makefile.in 2005-09-23 15:59:02
-@@ -31,7 +31,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/
+--- old/Makefile.in
++++ new/Makefile.in
+@@ -32,7 +32,7 @@ LIBOBJ=lib/wildmatch.o lib/compat.o lib/
ZLIBOBJ=zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \
zlib/trees.o zlib/zutil.o zlib/adler32.o zlib/compress.o zlib/crc32.o
- OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
-- main.o checksum.o match.o syscall.o log.o backup.o
-+ main.o checksum.o match.o syscall.o log.o backup.o @EXTRA_OBJECT@
- OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
- fileio.o batch.o clientname.o chmod.o
+ OBJS1=flist.o rsync.o generator.o receiver.o cleanup.o sender.o exclude.o \
+- util.o main.o checksum.o match.o syscall.o log.o backup.o
++ util.o main.o checksum.o match.o syscall.o log.o backup.o @EXTRA_OBJECT@
+ OBJS2=options.o io.o compat.o hlink.o token.o uidlist.o socket.o hashtable.o \
+ fileio.o batch.o clientname.o chmod.o acls.o xattrs.o
OBJS3=progress.o pipe.o
---- orig/cleanup.c 2006-01-14 08:14:29
-+++ cleanup.c 2005-09-23 15:59:19
-@@ -23,6 +23,7 @@
-
+--- old/cleanup.c
++++ new/cleanup.c
+@@ -26,6 +26,7 @@ extern int am_server;
+ extern int am_daemon;
extern int io_error;
extern int keep_partial;
+extern int am_generator;
extern int log_got_error;
extern char *partial_dir;
+ extern char *logfile_name;
+@@ -173,8 +174,13 @@ NORETURN void _exit_cleanup(int code, co
+ code = exit_code = RERR_PARTIAL;
+ }
-@@ -144,8 +145,13 @@ void _exit_cleanup(int code, const char
- code = RERR_PARTIAL;
- }
-
-- if (code)
-+ if (code) {
- log_exit(code, file, line);
+- if (code || am_daemon || (logfile_name && (am_server || !verbose)))
++ if (code || am_daemon || (logfile_name && (am_server || !verbose))) {
+ log_exit(code, file, line);
+#ifdef HAVE_LIBODBC
-+ db_log_exit(code,file,line);
-+ db_log_close();
++ db_log_exit(code, file, line);
++ db_log_close();
+#endif
-+ }
++ }
- if (verbose > 2) {
- rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n",
---- orig/clientserver.c 2006-01-14 08:14:29
-+++ clientserver.c 2005-09-23 15:59:36
-@@ -387,6 +387,9 @@ static int rsync_module(int f_in, int f_
+ /* FALLTHROUGH */
+ #include "case_N.h"
+--- old/clientserver.c
++++ new/clientserver.c
+@@ -410,6 +410,9 @@ static int rsync_module(int f_in, int f_
XFLG_ABS_IF_SLASH | XFLG_OLD_PREFIXES);
- log_init();
+ log_init(1);
+#ifdef HAVE_LIBODBC
+ db_log_open();
+#endif
#ifdef HAVE_PUTENV
if (*lp_prexfer_exec(i) || *lp_postxfer_exec(i)) {
-@@ -624,6 +627,9 @@ static int rsync_module(int f_in, int f_
+@@ -649,6 +652,9 @@ static int rsync_module(int f_in, int f_
rprintf(FLOG, "rsync %s %s from %s@%s (%s)\n",
am_sender ? "on" : "to",
request, auth_user, host, addr);
} else {
rprintf(FLOG, "rsync %s %s from %s (%s)\n",
am_sender ? "on" : "to",
---- orig/configure.in 2006-01-15 14:52:33
-+++ configure.in 2005-09-24 18:38:47
-@@ -552,6 +552,12 @@ if test x"$with_included_popt" != x"yes"
+--- old/configure.in
++++ new/configure.in
+@@ -659,6 +659,12 @@ if test x"$with_included_popt" != x"yes"
AC_CHECK_LIB(popt, poptGetContext, , [with_included_popt=yes])
fi
AC_MSG_CHECKING([whether to use included libpopt])
if test x"$with_included_popt" = x"yes"; then
AC_MSG_RESULT($srcdir/popt)
---- orig/db_log_error-list.txt 2005-09-23 15:58:32
-+++ db_log_error-list.txt 2005-09-23 15:58:32
+--- old/db_log_error-list.txt
++++ new/db_log_error-list.txt
@@ -0,0 +1,35 @@
+error type description
+0 not an error.
+31 unlink
+32 failed to open file/directory
+33 open?
---- orig/dblog-tables-mysql.sql 2005-09-23 16:08:39
-+++ dblog-tables-mysql.sql 2005-09-23 16:08:39
+--- old/dblog-tables-mysql.sql
++++ new/dblog-tables-mysql.sql
@@ -0,0 +1,64 @@
+drop table transfer;
+drop table exit;
+ PrimaryKey (id),
+ foreign key (session_id) references session (id)
+);
---- orig/dblog-tables-postgresql.sql 2005-09-23 16:00:34
-+++ dblog-tables-postgresql.sql 2005-09-23 16:00:34
+--- old/dblog-tables-postgresql.sql
++++ new/dblog-tables-postgresql.sql
@@ -0,0 +1,67 @@
+drop table transfer;
+drop table exit;
+ Primary Key (id),
+ foreign key (session_id) references session (id)
+);
---- orig/dblog.c 2005-09-24 18:25:52
-+++ dblog.c 2005-09-24 18:25:52
+--- old/dblog.c
++++ new/dblog.c
@@ -0,0 +1,549 @@
+/*
+ * ODBC Database logging functions
+ if (*strFileNamePtr == '/')
+ strFileNamePtr++;
+
-+ snprintf(strFileSize, sizeof strFileSize, "%.0f", (double)file->length);
++ snprintf(strFileSize, sizeof strFileSize, "%.0f", (double)F_LENGTH(file));
+ if (am_sender) {
+ intBytesTransferred = stats.total_written - initial_stats->total_written;
+ } else {
+ rprintf(FERROR,"Error at db_log_error: Not connected to database!\n");
+ }
+}
---- orig/instructions 2005-09-23 15:58:24
-+++ instructions 2005-09-23 15:58:24
+--- old/instructions
++++ new/instructions
@@ -0,0 +1,84 @@
+This patch adds the following options:
+
+ sequence is used for unique IDs). If False the statement will be executed
+ after the session row is inserted (as is done when the session ID is
+ automatically generates unique IDs). Defaults to True.
---- orig/loadparm.c 2005-09-19 17:21:10
-+++ loadparm.c 2005-09-24 18:29:59
-@@ -120,9 +120,16 @@ typedef struct
+--- old/loadparm.c
++++ new/loadparm.c
+@@ -124,9 +124,16 @@ typedef struct
{
char *auth_users;
char *comment;
char *filter;
char *gid;
char *hosts_allow;
-@@ -137,13 +144,19 @@ typedef struct
+@@ -144,15 +151,21 @@ typedef struct
char *prexfer_exec;
char *refuse_options;
char *secrets_file;
int max_connections;
int max_verbosity;
+ int syslog_facility;
int timeout;
+ BOOL database_logging;
+ BOOL fake_super;
+ BOOL get_custom_id_before_insert;
BOOL ignore_errors;
BOOL ignore_nonreadable;
BOOL list;
-@@ -163,9 +176,16 @@ static service sDefault =
+@@ -172,9 +185,16 @@ static service sDefault =
{
/* auth_users; */ NULL,
/* comment; */ NULL,
+ /* database_password; */ NULL,
+ /* database_username; */ NULL,
+ /* delete_table_name; */ NULL,
- /* dont_compress; */ "*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz",
+ /* dont_compress; */ DEFAULT_DONT_COMPRESS,
+ /* error_table_name; */ NULL,
/* exclude; */ NULL,
/* exclude_from; */ NULL,
/* filter; */ NULL,
/* gid; */ NOBODY_GROUP,
/* hosts_allow; */ NULL,
-@@ -180,13 +200,19 @@ static service sDefault =
+@@ -192,15 +212,21 @@ static service sDefault =
/* prexfer_exec; */ NULL,
/* refuse_options; */ NULL,
/* secrets_file; */ NULL,
/* max_connections; */ 0,
/* max_verbosity; */ 1,
+ /* syslog_facility; */ LOG_DAEMON,
/* timeout; */ 0,
+ /* database_logging; */ False,
+ /* fake_super; */ False,
+ /* get_custom_id_before_insert; */ True,
/* ignore_errors; */ False,
/* ignore_nonreadable; */ False,
/* list; */ True,
-@@ -287,10 +313,19 @@ static struct parm_struct parm_table[] =
+@@ -299,11 +325,20 @@ static struct parm_struct parm_table[] =
{"auth users", P_STRING, P_LOCAL, &sDefault.auth_users, NULL,0},
{"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL,0},
{"exclude from", P_STRING, P_LOCAL, &sDefault.exclude_from, NULL,0},
{"exclude", P_STRING, P_LOCAL, &sDefault.exclude, NULL,0},
+ {"exit table name", P_STRING, P_LOCAL, &sDefault.exit_table_name, NULL,0},
+ {"fake super", P_BOOL, P_LOCAL, &sDefault.fake_super, NULL,0},
{"filter", P_STRING, P_LOCAL, &sDefault.filter, NULL,0},
+ {"get custom id before insert",P_BOOL,P_LOCAL,&sDefault.get_custom_id_before_insert,NULL,0},
{"gid", P_STRING, P_LOCAL, &sDefault.gid, NULL,0},
{"hosts allow", P_STRING, P_LOCAL, &sDefault.hosts_allow, NULL,0},
{"hosts deny", P_STRING, P_LOCAL, &sDefault.hosts_deny, NULL,0},
-@@ -312,11 +347,15 @@ static struct parm_struct parm_table[] =
+@@ -328,12 +363,16 @@ static struct parm_struct parm_table[] =
{"read only", P_BOOL, P_LOCAL, &sDefault.read_only, NULL,0},
{"refuse options", P_STRING, P_LOCAL, &sDefault.refuse_options, NULL,0},
{"secrets file", P_STRING, P_LOCAL, &sDefault.secrets_file, NULL,0},
+ {"sequence name", P_STRING, P_LOCAL, &sDefault.sequence_name, NULL,0},
+ {"session table name",P_STRING, P_LOCAL, &sDefault.session_table_name,NULL,0},
{"strict modes", P_BOOL, P_LOCAL, &sDefault.strict_modes, NULL,0},
+ {"syslog facility", P_ENUM, P_LOCAL, &sDefault.syslog_facility,enum_facilities,0},
{"temp dir", P_PATH, P_LOCAL, &sDefault.temp_dir, NULL,0},
{"timeout", P_INTEGER,P_LOCAL, &sDefault.timeout, NULL,0},
{"transfer logging", P_BOOL, P_LOCAL, &sDefault.transfer_logging, NULL,0},
{"use chroot", P_BOOL, P_LOCAL, &sDefault.use_chroot, NULL,0},
{"write only", P_BOOL, P_LOCAL, &sDefault.write_only, NULL,0},
{NULL, P_BOOL, P_NONE, NULL, NULL,0}
-@@ -377,9 +416,16 @@ FN_GLOBAL_INTEGER(lp_syslog_facility, &G
+@@ -389,9 +428,16 @@ FN_GLOBAL_INTEGER(lp_rsync_port, &Global
FN_LOCAL_STRING(lp_auth_users, auth_users)
FN_LOCAL_STRING(lp_comment, comment)
FN_LOCAL_STRING(lp_filter, filter)
FN_LOCAL_STRING(lp_gid, gid)
FN_LOCAL_STRING(lp_hosts_allow, hosts_allow)
-@@ -394,13 +440,19 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf
+@@ -409,15 +455,21 @@ FN_LOCAL_STRING(lp_postxfer_exec, postxf
FN_LOCAL_STRING(lp_prexfer_exec, prexfer_exec)
FN_LOCAL_STRING(lp_refuse_options, refuse_options)
FN_LOCAL_STRING(lp_secrets_file, secrets_file)
+FN_LOCAL_STRING(lp_sequence_name,sequence_name)
+FN_LOCAL_STRING(lp_session_table_name,session_table_name)
+ FN_LOCAL_INTEGER(lp_syslog_facility, syslog_facility)
FN_LOCAL_STRING(lp_temp_dir, temp_dir)
+FN_LOCAL_STRING(lp_transfer_table_name, transfer_table_name)
FN_LOCAL_STRING(lp_uid, uid)
FN_LOCAL_INTEGER(lp_timeout, timeout)
+FN_LOCAL_BOOL(lp_database_logging, database_logging)
+ FN_LOCAL_BOOL(lp_fake_super, fake_super)
+FN_LOCAL_BOOL(lp_get_custom_id_before_insert,get_custom_id_before_insert)
FN_LOCAL_BOOL(lp_ignore_errors, ignore_errors)
FN_LOCAL_BOOL(lp_ignore_nonreadable, ignore_nonreadable)
FN_LOCAL_BOOL(lp_list, list)
---- orig/log.c 2006-01-17 02:16:40
-+++ log.c 2005-09-23 16:01:13
-@@ -87,7 +87,7 @@ struct {
+--- old/log.c
++++ new/log.c
+@@ -96,7 +96,7 @@ struct {
/*
* Map from rsync error code to name, or return NULL.
*/
{
int i;
for (i = 0; rerr_names[i].name; i++) {
---- orig/main.c 2006-01-15 14:46:15
-+++ main.c 2005-09-23 16:01:22
-@@ -159,6 +159,9 @@ static void handle_stats(int f)
-
- if (am_daemon) {
- log_exit(0, __FILE__, __LINE__);
-+#ifdef HAVE_LIBODBC
-+ db_log_exit(0,__FILE__,__LINE__);
-+#endif
- if (f == -1 || !am_sender)
- return;
- }
---- orig/receiver.c 2006-01-14 20:27:09
-+++ receiver.c 2006-01-14 08:27:51
-@@ -174,6 +174,10 @@ static int get_tmpname(char *fnametmp, c
+--- old/receiver.c
++++ new/receiver.c
+@@ -111,6 +111,10 @@ int get_tmpname(char *fnametmp, char *fn
if (maxname < 1) {
rprintf(FERROR, "temporary filename too long: %s\n", fname);
fnametmp[0] = '\0';
return 0;
}
-@@ -290,6 +294,11 @@ static int receive_data(int f_in, char *
- rsyserr(FERROR, errno,
- "lseek failed on %s",
- full_fname(fname));
+@@ -176,6 +180,10 @@ static int receive_data(int f_in, char *
+ if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
+ rsyserr(FERROR, errno, "lseek of %s returned %.0f, not %.0f",
+ full_fname(fname), (double)j, (double)offset);
++#ifdef HAVE_LIBODBC
++ db_log_error(FERROR, 14, "lseek failed on %s",
++ full_fname(fname));
++#endif
+ exit_cleanup(RERR_FILEIO);
+ }
+ }
+@@ -233,6 +241,11 @@ static int receive_data(int f_in, char *
+ "lseek of %s returned %.0f, not %.0f",
+ full_fname(fname),
+ (double)pos, (double)offset);
+#ifdef HAVE_LIBODBC
+ db_log_error(FERROR, 14,
+ "lseek failed on %s",
exit_cleanup(RERR_FILEIO);
}
continue;
-@@ -315,6 +324,9 @@ static int receive_data(int f_in, char *
+@@ -258,6 +271,9 @@ static int receive_data(int f_in, char *
report_write_error:
rsyserr(FERROR, errno, "write failed on %s",
full_fname(fname));
exit_cleanup(RERR_FILEIO);
}
-@@ -358,6 +370,12 @@ static void handle_delayed_updates(struc
+@@ -301,6 +317,12 @@ static void handle_delayed_updates(char
rsyserr(FERROR, errno,
"rename failed for %s (from %s)",
full_fname(fname), partialptr);
+ partialptr);
+#endif
} else {
- if (remove_sent_files
- || (preserve_hard_links
-@@ -480,6 +498,9 @@ int recv_files(int f_in, struct file_lis
+ if (remove_source_files
+ || (preserve_hard_links && F_IS_HLINKED(file)))
+@@ -454,6 +476,9 @@ int recv_files(int f_in, char *local_nam
if (server_filter_list.head
&& check_filter(&server_filter_list, fname, 0) < 0) {
rprintf(FERROR, "attempt to hack rsync failed.\n");
+#ifdef HAVE_LIBODBC
-+ db_log_error(FERROR,17,"attempt to hack rsync failed.");
++ db_log_error(FERROR,17,"attempt to hack rsync failed.");
+#endif
exit_cleanup(RERR_PROTOCOL);
}
-@@ -535,6 +556,11 @@ int recv_files(int f_in, struct file_lis
+@@ -512,6 +537,11 @@ int recv_files(int f_in, char *local_nam
rprintf(FERROR,
"invalid basis_dir index: %d.\n",
fnamecmp_type);
exit_cleanup(RERR_PROTOCOL);
}
pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
-@@ -580,6 +606,9 @@ int recv_files(int f_in, struct file_lis
- if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
+@@ -560,6 +590,9 @@ int recv_files(int f_in, char *local_nam
+ } else if (do_fstat(fd1,&st) != 0) {
rsyserr(FERROR, errno, "fstat %s failed",
full_fname(fnamecmp));
+#ifdef HAVE_LIBODBC
-+ db_log_error(FERROR, 19,"fstat %s failed",full_fname(fnamecmp));
++ db_log_error(FERROR, 19,"fstat %s failed",full_fname(fnamecmp));
+#endif
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
- continue;
-@@ -593,6 +622,9 @@ int recv_files(int f_in, struct file_lis
+ if (inc_recurse)
+@@ -575,6 +608,9 @@ int recv_files(int f_in, char *local_nam
*/
rprintf(FERROR,"recv_files: %s is a directory\n",
full_fname(fnamecmp));
+#ifdef HAVE_LIBODBC
-+ db_log_error(FERROR,20,"recv_files: %s is a directory",full_fname(fnamecmp));
++ db_log_error(FERROR,20,"recv_files: %s is a directory",full_fname(fnamecmp));
+#endif
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
close(fd1);
- continue;
-@@ -616,6 +648,9 @@ int recv_files(int f_in, struct file_lis
+ if (inc_recurse)
+@@ -609,6 +645,9 @@ int recv_files(int f_in, char *local_nam
if (fd2 == -1) {
rsyserr(FERROR, errno, "open %s failed",
full_fname(fname));
+#ifdef HAVE_LIBODBC
-+ db_log_error(FERROR,22, "open %s failed", full_fname(fname));
++ db_log_error(FERROR,22, "open %s failed", full_fname(fname));
+#endif
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
-@@ -649,6 +684,10 @@ int recv_files(int f_in, struct file_lis
+@@ -646,6 +685,10 @@ int recv_files(int f_in, char *local_nam
if (fd2 == -1) {
rsyserr(FERROR, errno, "mkstemp %s failed",
full_fname(fnametmp));
+#ifdef HAVE_LIBODBC
-+ db_log_error(FERROR, 22, "mkstemp %s failed",
++ db_log_error(FERROR, 22, "mkstemp %s failed",
+ full_fname(fnametmp));
+#endif
- discard_receive_data(f_in, file->length);
+ discard_receive_data(f_in, F_LENGTH(file));
if (fd1 != -1)
close(fd1);
-@@ -671,12 +710,19 @@ int recv_files(int f_in, struct file_lis
+@@ -668,12 +711,19 @@ int recv_files(int f_in, char *local_nam
+ fname, fd2, F_LENGTH(file));
- if (!log_before_transfer)
- log_item(file, &initial_stats, iflags, NULL);
+ log_item(log_code, file, &initial_stats, iflags, NULL);
+#ifdef HAVE_LIBODBC
+ db_log_transfer(file, &initial_stats, "receive");
+#endif
exit_cleanup(RERR_FILEIO);
}
-@@ -727,6 +773,12 @@ int recv_files(int f_in, struct file_lis
+@@ -730,6 +780,12 @@ int recv_files(int f_in, char *local_nam
rprintf(msgtype,
"%s: %s failed verification -- update %s%s.\n",
errstr, fname, keptstr, redostr);
+#ifdef HAVE_LIBODBC
-+ db_log_error(msgtype,24,
++ db_log_error(msgtype,24,
+ "%s: %s failed verification -- update %s%s.\n",
+ errstr, fname,
+ keptstr, redostr);
+#endif
}
- if (!phase) {
- SIVAL(numbuf, 0, i);
---- orig/sender.c 2006-01-14 20:27:10
-+++ sender.c 2005-09-23 16:01:44
-@@ -352,6 +352,9 @@ void send_files(struct file_list *flist,
+ if (!redoing) {
+ send_msg_int(MSG_REDO, ndx);
+--- old/sender.c
++++ new/sender.c
+@@ -344,6 +344,9 @@ void send_files(int f_in, int f_out)
+ end_progress(st.st_size);
- if (!log_before_transfer)
- log_item(file, &initial_stats, iflags, NULL);
+ log_item(log_code, file, &initial_stats, iflags, NULL);
+#ifdef HAVE_LIBODBC
+ db_log_transfer(file, &initial_stats,"send");
+#endif
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff