dovecot-2.0: dsync: Added -D (debug) parameter.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/f344426dab0a
changeset: 11095:f344426dab0a
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Apr 07 03:03:53 2010 +0300
description:
dsync: Added -D (debug) parameter.

diffstat:

 src/dsync/dsync.c |  16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r d9ec5fdb2d63 -r f344426dab0a src/dsync/dsync.c
--- a/src/dsync/dsync.c	Wed Apr 07 02:58:13 2010 +0300
+++ b/src/dsync/dsync.c	Wed Apr 07 03:03:53 2010 +0300
@@ -75,7 +75,8 @@
 int main(int argc, char *argv[])
 {
 	enum mail_storage_service_flags ssflags =
-		MAIL_STORAGE_SERVICE_FLAG_NO_CHDIR;
+		MAIL_STORAGE_SERVICE_FLAG_NO_CHDIR |
+		MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT;
 	enum dsync_brain_flags brain_flags = 0;
 	struct mail_storage_service_ctx *storage_service;
 	struct mail_storage_service_user *service_user;
@@ -85,12 +86,13 @@
 	const char *error, *username, *mailbox = NULL, *mirror_cmd = NULL;
 	const char *convert_location = NULL;
 	bool dsync_server = FALSE, readonly = FALSE, unexpected_changes = FALSE;
+	bool dsync_debug = FALSE;
 	char alt_char = '_';
 	int c, ret, fd_in = STDIN_FILENO, fd_out = STDOUT_FILENO;
 
 	master_service = master_service_init("dsync",
 					     MASTER_SERVICE_FLAG_STANDALONE,
-					     &argc, &argv, "C:fm:ru:v");
+					     &argc, &argv, "C:Dfm:ru:v");
 
 	username = getenv("USER");
 	while ((c = master_getopt(master_service)) > 0) {
@@ -100,6 +102,11 @@
 		case 'C':
 			alt_char = optarg[0];
 			break;
+		case 'D':
+			dsync_debug = TRUE;
+			brain_flags |= DSYNC_BRAIN_FLAG_VERBOSE;
+			ssflags |= MAIL_STORAGE_SERVICE_FLAG_DEBUG;
+			break;
 		case 'm':
 			mailbox = optarg;
 			break;
@@ -138,6 +145,11 @@
 		usage();
 	master_service_init_finish(master_service);
 
+	if (!dsync_debug) {
+		/* disable debugging unless -D is given */
+		i_set_debug_file("/dev/null");
+	}
+
 	memset(&input, 0, sizeof(input));
 	input.module = "mail";
 	input.service = "dsync";