diff mercurial/commandserver.py @ 23036:19f5273c9f3e

cmdserver: include pid of server handling requests in hello message Because unix-mode server forks child process per connection, client does not know the pid of the server that will handle requests. The pid is necessary to interrupt hung process: 1. client connects to socket server 2. server accepts the connection, forks, and tells pid 3. client requests "runcommand pull" .. hung .. 4. client sends SIGINT to the (forked) server 5. server returns from I/O wait Note that getsockopt(SO_PEERCRED) of Linux cannot be used because the server fork()s after accept().
author Yuya Nishihara <yuya@tcha.org>
date Sat, 18 Oct 2014 12:24:50 +0900
parents 840be5ca03e1
children 000cfc8b3913
line wrap: on
line diff
--- a/mercurial/commandserver.py	Sat Oct 18 21:52:11 2014 +0900
+++ b/mercurial/commandserver.py	Sat Oct 18 12:24:50 2014 +0900
@@ -232,6 +232,8 @@
         hellomsg = 'capabilities: ' + ' '.join(sorted(self.capabilities))
         hellomsg += '\n'
         hellomsg += 'encoding: ' + encoding.encoding
+        hellomsg += '\n'
+        hellomsg += 'pid: %d' % os.getpid()
 
         # write the hello msg in -one- chunk
         self.cout.write(hellomsg)