Logging: Add "D=" to more connection closure log lines. Bug 2434

[exim.git] / test / stderr / 0609

diff --git a/test/stderr/0609 b/test/stderr/0609
index ea998d6d7ab6409c47ef65daa6e0e4ec0d339365..8e99a3f7ecaace47bcc3d866b8dc84b8158bb745 100644 (file)
--- a/test/stderr/0609
+++ b/test/stderr/0609
@@ -3,50 +3,52 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

-ppppp daemon_smtp_port overridden by -oX:
-ppppp   <: 1225
-ppppp listening on all interfaces (IPv4) port 1225
-ppppp pid written to TESTSUITE/spool/exim-daemon.pid
-ppppp LOG: MAIN
-ppppp   exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-ppppp daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
-ppppp Listening...
-ppppp Connection request from 127.0.0.1 port sssss
-ppppp LOG: smtp_connection MAIN
-ppppp   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-ppppp 1 SMTP accept process running
-ppppp Listening...
-ppppp Process ppppp is handling incoming connection from [127.0.0.1]
-ppppp Process ppppp is ready for new message
-ppppp using ACL "delay4_accept"
-ppppp processing "accept"
-ppppp check delay = 4s
-ppppp delay modifier requests 4-second delay
-ppppp accept: condition test succeeded in ACL "delay4_accept"
-ppppp end of ACL "delay4_accept": ACCEPT
-ppppp LOG: smtp_connection MAIN
-ppppp   SMTP connection from [127.0.0.1] closed by QUIT
-ppppp child ppppp ended: status=0x0
-ppppp   normal exit, 0
-ppppp 0 SMTP accept processes now running
-ppppp Listening...
-ppppp Connection request from 127.0.0.1 port sssss
-ppppp LOG: smtp_connection MAIN
-ppppp   SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
-ppppp 1 SMTP accept process running
-ppppp Listening...
-ppppp Process ppppp is handling incoming connection from [127.0.0.1]
-ppppp Process ppppp is ready for new message
-ppppp using ACL "delay4_accept"
-ppppp processing "accept"
-ppppp check delay = 4s
-ppppp delay modifier requests 4-second delay
-ppppp delay cancelled by peer close
-ppppp accept: condition test succeeded in ACL "delay4_accept"
-ppppp end of ACL "delay4_accept": ACCEPT
-ppppp LOG: lost_incoming_connection MAIN
-ppppp   unexpected disconnection while reading SMTP command from [127.0.0.1] D=qqs
-ppppp child ppppp ended: status=0x100
-ppppp   normal exit, 1
-ppppp 0 SMTP accept processes now running
-ppppp Listening...
+dropping to exim gid; retaining priv uid
+daemon_smtp_port overridden by -oX:
+  <: 1225
+creating notifier socket
+ TESTSUITE/spool/exim_daemon_notify
+listening on all interfaces (IPv4) port PORT_D
+pid written to TESTSUITE/spool/exim-daemon.pid
+LOG: MAIN
+  exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
+daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
+Listening...
+Connection request from 127.0.0.1 port sssss
+LOG: smtp_connection MAIN
+  SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
+p1235 Process p1235 is handling incoming connection from [127.0.0.1]
+p1235 Process p1235 is ready for new message
+p1235 using ACL "delay4_accept"
+p1235 processing "accept" (TESTSUITE/test-config 24)
+p1235 check delay = 4s
+p1235 delay modifier requests 4-second delay
+1 SMTP accept process running
+Listening...
+p1235 accept: condition test succeeded in ACL "delay4_accept"
+p1235 end of ACL "delay4_accept": ACCEPT
+p1235 LOG: smtp_connection MAIN
+p1235   SMTP connection from (test) [127.0.0.1] D=qqs closed by QUIT
+p1235 >>>>>>>>>>>>>>>> Exim pid=p1235 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
+child p1235 ended: status=0x0
+  normal exit, 0
+0 SMTP accept processes now running
+Listening...
+Connection request from 127.0.0.1 port sssss
+LOG: smtp_connection MAIN
+  SMTP connection from [127.0.0.1] (TCP/IP connection count = 1)
+p1236 Process p1236 is handling incoming connection from [127.0.0.1]
+p1236 Process p1236 is ready for new message
+p1236 using ACL "delay4_accept"
+p1236 processing "accept" (TESTSUITE/test-config 24)
+p1236 check delay = 4s
+p1236 delay modifier requests 4-second delay
+p1236 delay cancelled by peer close
+p1236 accept: condition test succeeded in ACL "delay4_accept"
+p1236 end of ACL "delay4_accept": ACCEPT
+p1236 LOG: lost_incoming_connection MAIN
+p1236   unexpected disconnection while reading SMTP command from (test) [127.0.0.1] D=qqs
+p1236 >>>>>>>>>>>>>>>> Exim pid=p1236 (daemon-accept) terminating with rc=1 >>>>>>>>>>>>>>>>
+1 SMTP accept process running
+SIGTERM/SIGINT seen
+>>>>>>>>>>>>>>>> Exim pid=p1234 (daemon) terminating with rc=0 >>>>>>>>>>>>>>>>