diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-02-13 11:28:56 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-02-13 11:28:56 +0000 |
| commit | 9675b3847f805018897fc71dcc5c98b78defd510 (patch) | |
| tree | 8d16d8e0f5b0e008d2f92609604d44be8d7ac82d | |
| parent | 1688f43b3071b3b4d7d3a88a6ccf28c1bc3272e0 (diff) | |
Do not write to syslog when running in the test harness.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 6 | ||||
| -rw-r--r-- | src/src/log.c | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 3e3da3bfd..427f0b2a3 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.292 2006/02/13 11:13:37 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.293 2006/02/13 11:28:56 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -137,6 +137,10 @@ PH/24 An host item such as 1.2.3.4/abc was being treated as the IP address 1.2.3.4 without a mask. Now it is not recognized as an IP address, and PH/23 above applies. +PH/25 Do not write to syslog when running in the test harness. The only + occasion when this arises is a failure to open the main or panic logs + (for which there is an explicit test). + Exim version 4.60 diff --git a/src/src/log.c b/src/src/log.c index a388258c5..d5e89f2cf 100644 --- a/src/src/log.c +++ b/src/src/log.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/log.c,v 1.8 2006/02/07 11:19:00 ph10 Exp $ */ +/* $Cambridge: exim/src/src/log.c,v 1.9 2006/02/13 11:28:56 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -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 -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 @@ -72,6 +74,8 @@ write_syslog(int priority, uschar *s) int len, pass; int linecount = 0; +if (running_in_test_harness) return; + if (!syslog_timestamp) s += log_timezone? 26 : 20; len = Ustrlen(s); |