/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-05-01 20:07:28 UTC
  • Revision ID: teddy@recompile.se-20120501200728-tv1dn5uern8jshyn
* mandos (Client.stop_checker): Use new Popen.terminate() method.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
732
732
            return
733
733
        logger.debug("Stopping checker for %(name)s", vars(self))
734
734
        try:
735
 
            os.kill(self.checker.pid, signal.SIGTERM)
 
735
            self.checker.terminate()
736
736
            #time.sleep(0.5)
737
737
            #if self.checker.poll() is None:
738
 
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
738
            #    self.checker.kill()
739
739
        except OSError as error:
740
740
            if error.errno != errno.ESRCH: # No such process
741
741
                raise