upstream/mercurial-mirror Files · tests/killdaemons.py

sshpeer: store subprocess so it cleans up correctly...

sshpeer: store subprocess so it cleans up correctly When running 'hg pull --rebase', I was seeing this exception 100% of the time as the python process was closing down: Exception TypeError: TypeError("'NoneType' object is not callable",) in <bound method Popen.__del__ of <subprocess.Popen object at 0x937c10>> ignored By storing the subprocess on the sshpeer, the subprocess seems to clean up correctly, and I no longer see the exception. I have no idea why this actually works, but I get a 0% repro if I store the subprocess in self.subprocess, and a 100% repro if I store None in self.subprocess. Possibly related to issue 2240.

Patrick Mezard - - Load All Authors

File last commit:

r17466:d5a3bda6 default


                r18759:9baf4330

default

Download file

             killdaemons.py
        
                    54 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / tests / killdaemons.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #!/usr/bin/env python

      import os, sys, time, errno, signal

      if os.name =='nt':

          import ctypes

          def kill(pid, logfn, tryhard=True):

              logfn('# Killing daemon process %d' % pid)

              PROCESS_TERMINATE = 1

              handle = ctypes.windll.kernel32.OpenProcess(

                      PROCESS_TERMINATE, False, pid)

              ctypes.windll.kernel32.TerminateProcess(handle, -1)

              ctypes.windll.kernel32.CloseHandle(handle)

      else:

          def kill(pid, logfn, tryhard=True):

              try:

                  os.kill(pid, 0)

                  logfn('# Killing daemon process %d' % pid)

                  os.kill(pid, signal.SIGTERM)

                  if tryhard:

                      for i in range(10):

                          time.sleep(0.05)

                          os.kill(pid, 0)

                  else:

                      time.sleep(0.1)

                      os.kill(pid, 0)

                  logfn('# Daemon process %d is stuck - really killing it' % pid)

                  os.kill(pid, signal.SIGKILL)

              except OSError, err:

                  if err.errno != errno.ESRCH:

                      raise

      def killdaemons(pidfile, tryhard=True, remove=False, logfn=None):

          if not logfn:

              logfn = lambda s: s

          # Kill off any leftover daemon processes

          try:

              fp = open(pidfile)

              for line in fp:

                  try:

                      pid = int(line)

                  except ValueError:

                      continue

                  kill(pid, logfn, tryhard)

              fp.close()

              if remove:

                  os.unlink(pidfile)

          except IOError:

              pass

      if __name__ == '__main__':

          path, = sys.argv[1:]

          killdaemons(path)

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				#!/usr/bin/env python

				import os, sys, time, errno, signal

				if os.name =='nt':
				import ctypes
				def kill(pid, logfn, tryhard=True):
				logfn('# Killing daemon process %d' % pid)
				PROCESS_TERMINATE = 1
				handle = ctypes.windll.kernel32.OpenProcess(
				PROCESS_TERMINATE, False, pid)
				ctypes.windll.kernel32.TerminateProcess(handle, -1)
				ctypes.windll.kernel32.CloseHandle(handle)
				else:
				def kill(pid, logfn, tryhard=True):
				try:
				os.kill(pid, 0)
				logfn('# Killing daemon process %d' % pid)
				os.kill(pid, signal.SIGTERM)
				if tryhard:
				for i in range(10):
				time.sleep(0.05)
				os.kill(pid, 0)
				else:
				time.sleep(0.1)
				os.kill(pid, 0)
				logfn('# Daemon process %d is stuck - really killing it' % pid)
				os.kill(pid, signal.SIGKILL)
				except OSError, err:
				if err.errno != errno.ESRCH:
				raise

				def killdaemons(pidfile, tryhard=True, remove=False, logfn=None):
				if not logfn:
				logfn = lambda s: s
				# Kill off any leftover daemon processes
				try:
				fp = open(pidfile)
				for line in fp:
				try:
				pid = int(line)
				except ValueError:
				continue
				kill(pid, logfn, tryhard)
				fp.close()
				if remove:
				os.unlink(pidfile)
				except IOError:
				pass

				if __name__ == '__main__':
				path, = sys.argv[1:]
				killdaemons(path)