Mercurial > dovecot > original-hg > dovecot-1.2
diff src/imap/main.c @ 5333:55260092b094 HEAD
Fixes to handling log prefixes. imap/pop3 processes now log the
mail_log_prefix even when started with --exec-mail.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Thu, 15 Mar 2007 17:53:00 +0200 |
| parents | 784dc7224718 |
| children | 4862cb37106c |
line wrap: on
line diff
--- a/src/imap/main.c Thu Mar 15 17:51:58 2007 +0200 +++ b/src/imap/main.c Thu Mar 15 17:53:00 2007 +0200 @@ -97,20 +97,23 @@ return; } - user = getenv("USER"); - if (user == NULL) { - if (IS_STANDALONE()) - user = getlogin(); - if (user == NULL) - user = "??"; + if (getenv("LOG_PREFIX") != NULL) + strocpy(log_prefix, getenv("LOG_PREFIX"), sizeof(log_prefix)); + else { + user = getenv("USER"); + if (user == NULL) { + if (IS_STANDALONE()) + user = getlogin(); + if (user == NULL) + user = "??"; + } + if (strlen(user) >= sizeof(log_prefix)-6) { + /* quite a long user name, cut it */ + user = t_strndup(user, sizeof(log_prefix)-6-2); + user = t_strconcat(user, "..", NULL); + } + i_snprintf(log_prefix, sizeof(log_prefix), "imap(%s): ", user); } - if (strlen(user) >= sizeof(log_prefix)-6) { - /* quite a long user name, cut it */ - user = t_strndup(user, sizeof(log_prefix)-6-2); - user = t_strconcat(user, "..", NULL); - } - i_snprintf(log_prefix, sizeof(log_prefix), "imap(%s)", user); - if (getenv("USE_SYSLOG") != NULL) { const char *env = getenv("SYSLOG_FACILITY"); i_set_failure_syslog(log_prefix, LOG_NDELAY,