[dovecot-cvs] dovecot/src/master mail-process.c, 1.116, 1.117 main.c, 1.101, 1.102

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv15106/master

Modified Files:
	mail-process.c main.c 
Log Message:
Fixes to handling log prefixes. imap/pop3 processes now log the
mail_log_prefix even when started with --exec-mail.



Index: mail-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/mail-process.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- mail-process.c	15 Mar 2007 13:59:13 -0000	1.116
+++ mail-process.c	15 Mar 2007 15:53:05 -0000	1.117
@@ -357,6 +357,13 @@
 		env_put(t_strconcat("LOGFILE=", set->log_path, NULL));
 	if (*set->info_log_path != '\0')
 		env_put(t_strconcat("INFOLOGFILE=", set->info_log_path, NULL));
+	if (*set->mail_log_prefix != '\0') {
+		string_t *str = t_str_new(256);
+
+		str_append(str, "LOG_PREFIX=");
+		var_expand(str, set->mail_log_prefix, var_expand_table);
+		env_put(str_c(str));
+	}
 
 	mail_process_set_environment(set, getenv("MAIL"), var_expand_table,
 				     FALSE);

Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/main.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- main.c	8 Mar 2007 22:07:34 -0000	1.101
+++ main.c	15 Mar 2007 15:53:05 -0000	1.102
@@ -134,7 +134,7 @@
 		i_set_failure_syslog("dovecot", LOG_NDELAY, facility);
 	} else {
 		/* log to file or stderr */
-		i_set_failure_file(set->log_path, "dovecot");
+		i_set_failure_file(set->log_path, "dovecot: ");
 	}
 
 	if (*set->info_log_path != '\0')