git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add "continue" modifier.
[exim.git]
/
src
/
src
/
log.c
diff --git
a/src/src/log.c
b/src/src/log.c
index a39e2abfa62e24619e3d5e0483cc614522a832a4..5cc30928747c83ae0f0e1d740dccadb2ac479432 100644
(file)
--- a/
src/src/log.c
+++ b/
src/src/log.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/log.c,v 1.
4 2005/06/22 15:44:38
ph10 Exp $ */
+/* $Cambridge: exim/src/src/log.c,v 1.
12 2007/01/31 16:52:12
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
5
*/
+/* Copyright (c) University of Cambridge 1995 - 200
7
*/
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for writing log files. The code for maintaining datestamped
/* See the file NOTICE for conditions of use and distribution. */
/* Functions for writing log files. The code for maintaining datestamped
@@
-57,7
+57,9
@@
static uschar *file_path = US"";
/* The given string is split into sections according to length, or at embedded
newlines, and syslogged as a numbered sequence if it is overlong or if there is
/* The given string is split into sections according to length, or at embedded
newlines, and syslogged as a numbered sequence if it is overlong or if there is
-more than one line.
+more than one line. However, if we are running in the test harness, do not do
+anything. (The test harness doesn't use syslog - for obvious reasons - but we
+can get here if there is a failure to open the panic log.)
Arguments:
priority syslog priority
Arguments:
priority syslog priority
@@
-72,6
+74,8
@@
write_syslog(int priority, uschar *s)
int len, pass;
int linecount = 0;
int len, pass;
int linecount = 0;
+if (running_in_test_harness) return;
+
if (!syslog_timestamp) s += log_timezone? 26 : 20;
len = Ustrlen(s);
if (!syslog_timestamp) s += log_timezone? 26 : 20;
len = Ustrlen(s);
@@
-720,15
+724,29
@@
if (disable_logging)
return;
}
return;
}
+/* Handle disabled reject log */
+
+if (!write_rejectlog) flags &= ~LOG_REJECT;
+
/* Create the main message in the log buffer, including the message
id except for the process log and when called by a utility. */
ptr = log_buffer;
/* Create the main message in the log buffer, including the message
id except for the process log and when called by a utility. */
ptr = log_buffer;
+sprintf(CS ptr, "%s ", tod_stamp(tod_log));
+while(*ptr) ptr++;
+
+if ((log_extra_selector & LX_pid) != 0)
+ {
+ sprintf(CS ptr, "[%d] ", (int)getpid());
+ while (*ptr) ptr++;
+ }
+
if (really_exim && (flags & LOG_PROCESS) == 0 && message_id[0] != 0)
if (really_exim && (flags & LOG_PROCESS) == 0 && message_id[0] != 0)
- sprintf(CS ptr, "%s %s ", tod_stamp(tod_log), message_id);
-else sprintf(CS ptr, "%s ", tod_stamp(tod_log));
+ {
+ sprintf(CS ptr, "%s ", message_id);
+ while(*ptr) ptr++;
+ }
-while(*ptr) ptr++;
if ((flags & LOG_CONFIG) != 0) ptr = log_config_info(ptr, flags);
va_start(ap, format);
if ((flags & LOG_CONFIG) != 0) ptr = log_config_info(ptr, flags);
va_start(ap, format);
@@
-741,7
+759,7
@@
va_end(ap);
this way because it kind of fits with LOG_RECIPIENTS. */
if ((flags & LOG_SENDER) != 0 &&
this way because it kind of fits with LOG_RECIPIENTS. */
if ((flags & LOG_SENDER) != 0 &&
- ptr < log_buffer + LOG_BUFFER_SIZE -
8
- Ustrlen(raw_sender))
+ ptr < log_buffer + LOG_BUFFER_SIZE -
10
- Ustrlen(raw_sender))
{
sprintf(CS ptr, " from <%s>", raw_sender);
while (*ptr) ptr++;
{
sprintf(CS ptr, " from <%s>", raw_sender);
while (*ptr) ptr++;
@@
-814,7
+832,7
@@
if ((flags & LOG_MAIN) != 0 &&
uschar *nowstamp = tod_stamp(tod_log_datestamp);
if (Ustrncmp (mainlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0)
{
uschar *nowstamp = tod_stamp(tod_log_datestamp);
if (Ustrncmp (mainlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0)
{
-
close(mainlogfd);
/* Close the file */
+
(void)close(mainlogfd);
/* Close the file */
mainlogfd = -1; /* Clear the file descriptor */
mainlog_inode = 0; /* Unset the inode */
mainlog_datestamp = NULL; /* Clear the datestamp */
mainlogfd = -1; /* Clear the file descriptor */
mainlog_inode = 0; /* Unset the inode */
mainlog_datestamp = NULL; /* Clear the datestamp */
@@
-830,7
+848,7
@@
if ((flags & LOG_MAIN) != 0 &&
{
if (Ustat(mainlog_name, &statbuf) < 0 || statbuf.st_ino != mainlog_inode)
{
{
if (Ustat(mainlog_name, &statbuf) < 0 || statbuf.st_ino != mainlog_inode)
{
- close(mainlogfd);
+
(void)
close(mainlogfd);
mainlogfd = -1;
mainlog_inode = 0;
}
mainlogfd = -1;
mainlog_inode = 0;
}
@@
-854,11
+872,12
@@
if ((flags & LOG_MAIN) != 0 &&
}
}
}
}
-/* Handle the log for rejected messages. This can be globally disabled. If
-there are any header lines (i.e. if the rejection is happening after the DATA
-phase), log the recipients and the headers. */
+/* Handle the log for rejected messages. This can be globally disabled, in
+which case the flags are altered above. If there are any header lines (i.e. if
+the rejection is happening after the DATA phase), log the recipients and the
+headers. */
-if (
write_rejectlog &&
(flags & LOG_REJECT) != 0)
+if ((flags & LOG_REJECT) != 0)
{
header_line *h;
{
header_line *h;
@@
-936,7
+955,7
@@
if (write_rejectlog && (flags & LOG_REJECT) != 0)
uschar *nowstamp = tod_stamp(tod_log_datestamp);
if (Ustrncmp (rejectlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0)
{
uschar *nowstamp = tod_stamp(tod_log_datestamp);
if (Ustrncmp (rejectlog_datestamp, nowstamp, Ustrlen(nowstamp)) != 0)
{
-
close(rejectlogfd);
/* Close the file */
+
(void)close(rejectlogfd);
/* Close the file */
rejectlogfd = -1; /* Clear the file descriptor */
rejectlog_inode = 0; /* Unset the inode */
rejectlog_datestamp = NULL; /* Clear the datestamp */
rejectlogfd = -1; /* Clear the file descriptor */
rejectlog_inode = 0; /* Unset the inode */
rejectlog_datestamp = NULL; /* Clear the datestamp */
@@
-953,7
+972,7
@@
if (write_rejectlog && (flags & LOG_REJECT) != 0)
if (Ustat(rejectlog_name, &statbuf) < 0 ||
statbuf.st_ino != rejectlog_inode)
{
if (Ustat(rejectlog_name, &statbuf) < 0 ||
statbuf.st_ino != rejectlog_inode)
{
- close(rejectlogfd);
+
(void)
close(rejectlogfd);
rejectlogfd = -1;
rejectlog_inode = 0;
}
rejectlogfd = -1;
rejectlog_inode = 0;
}
@@
-997,11
+1016,11
@@
if ((flags & LOG_PROCESS) != 0)
/* Handle the panic log, which is not kept open like the others. If it fails to
open, there will be a recursive call to log_write(). We detect this above and
attempt to write to the system log as a last-ditch try at telling somebody. In
/* Handle the panic log, which is not kept open like the others. If it fails to
open, there will be a recursive call to log_write(). We detect this above and
attempt to write to the system log as a last-ditch try at telling somebody. In
-all cases, try to write to log_stderr. */
+all cases
except mua_wrapper
, try to write to log_stderr. */
if ((flags & LOG_PANIC) != 0)
{
if ((flags & LOG_PANIC) != 0)
{
- if (log_stderr != NULL && log_stderr != debug_file)
+ if (log_stderr != NULL && log_stderr != debug_file
&& !mua_wrapper
)
fprintf(log_stderr, "%s", CS log_buffer);
if ((logging_mode & LOG_MODE_SYSLOG) != 0)
fprintf(log_stderr, "%s", CS log_buffer);
if ((logging_mode & LOG_MODE_SYSLOG) != 0)
@@
-1031,7
+1050,7
@@
if ((flags & LOG_PANIC) != 0)
flags |= LOG_PANIC_DIE;
}
flags |= LOG_PANIC_DIE;
}
- close(paniclogfd);
+
(void)
close(paniclogfd);
}
/* Give up if the DIE flag is set */
}
/* Give up if the DIE flag is set */
@@
-1051,9
+1070,9
@@
void
log_close_all(void)
{
if (mainlogfd >= 0)
log_close_all(void)
{
if (mainlogfd >= 0)
- { close(mainlogfd); mainlogfd = -1; }
+ {
(void)
close(mainlogfd); mainlogfd = -1; }
if (rejectlogfd >= 0)
if (rejectlogfd >= 0)
- { close(rejectlogfd); rejectlogfd = -1; }
+ {
(void)
close(rejectlogfd); rejectlogfd = -1; }
closelog();
syslog_open = FALSE;
}
closelog();
syslog_open = FALSE;
}