Remove the daemon pid file when exit is due to SIGTERM. Bug 340

[exim.git] / test / log / 0574

diff --git a/test/log/0574 b/test/log/0574
index 042d10c6ed0050525798d1359ee9d4c510a0a8df..2467a0a6762c41a28429cc11bd456abb4324fb12 100644 (file)
--- a/test/log/0574
+++ b/test/log/0574
@@ -1,25 +1,4 @@
-1999-03-02 09:44:33 using queue ''
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss for normal@test.ex
-1999-03-02 09:44:33 using queue 'alternate'
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=alternate for alternate@test.ex
-1999-03-02 09:44:33 Start queue run: pid=pppp -qq
-1999-03-02 09:44:33 10HmaX-0005vi-00 => normal <normal@test.ex> F=<CALLER@the.local.host.name> R=all T=dump
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
-1999-03-02 09:44:33 End queue run: pid=pppp -qq
-1999-03-02 09:44:33 Start 'nosuchqueue' queue run: pid=pppp
-1999-03-02 09:44:33 End 'nosuchqueue' queue run: pid=pppp
-1999-03-02 09:44:33 Start 'alternate' queue run: pid=pppp
-1999-03-02 09:44:33 10HmaY-0005vi-00 => alternate <alternate@test.ex> F=<CALLER@the.local.host.name> Q=alternate R=all T=dump
-1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 End 'alternate' queue run: pid=pppp
-1999-03-02 09:44:33 using queue 'lowpri'
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local-smtp S=sss Q=lowpri for lowpri@test.ex
 
 ******** SERVER ********
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, -q3s, not listening for SMTP
-1999-03-02 09:44:33 Start 'lowpri' queue run: pid=pppp
-1999-03-02 09:44:33 End 'lowpri' queue run: pid=pppp
-1999-03-02 09:44:33 Start 'lowpri' queue run: pid=pppp
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => lowpri <lowpri@test.ex> F=<CALLER@the.local.host.name> Q=lowpri R=all T=dump
-1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
-1999-03-02 09:44:33 End 'lowpri' queue run: pid=pppp
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= tester@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss