/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

* mandos (Client.start_checker): Bug fix: Fix race condition with
                                 short intervals.

Show diffs side-by-side

added added

removed removed

Lines of Context:
398
398
        # is as it should be.
399
399
        
400
400
        # If a checker exists, make sure it is not a zombie
401
 
        if self.checker is not None:
 
401
        try:
402
402
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
403
        except (AttributeError, OSError), error:
 
404
            if (isinstance(error, OSError)
 
405
                and error.errno != errno.ECHILD):
 
406
                raise error
 
407
        else:
403
408
            if pid:
404
409
                logger.warning(u"Checker was a zombie")
405
410
                gobject.source_remove(self.checker_callback_tag)