[dovecot-cvs] dovecot/src/master mail-process.c, 1.96.2.17, 1.96.2.18 main.c, 1.80.2.17, 1.80.2.18

[tss at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	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.96.2.17
retrieving revision 1.96.2.18
diff -u -d -r1.96.2.17 -r1.96.2.18
--- mail-process.c	15 Mar 2007 13:59:10 -0000	1.96.2.17
+++ mail-process.c	15 Mar 2007 15:52:56 -0000	1.96.2.18
@@ -359,6 +359,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.80.2.17
retrieving revision 1.80.2.18
diff -u -d -r1.80.2.17 -r1.80.2.18
--- main.c	27 Jan 2007 01:44:25 -0000	1.80.2.17
+++ main.c	15 Mar 2007 15:52:56 -0000	1.80.2.18
@@ -119,7 +119,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')