summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2006-02-13 11:28:56 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2006-02-13 11:28:56 +0000
commit9675b3847f805018897fc71dcc5c98b78defd510 (patch)
tree8d16d8e0f5b0e008d2f92609604d44be8d7ac82d /src
parent1688f43b3071b3b4d7d3a88a6ccf28c1bc3272e0 (diff)
Do not write to syslog when running in the test harness.
Diffstat (limited to 'src')
-rw-r--r--src/src/log.c8
1 files changed, 6 insertions, 2 deletions
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);