diff options
| author | Rob Austein <sra@hactrn.net> | 2014-11-26 01:17:19 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-11-26 01:17:19 +0000 |
| commit | 755edaf56decc85339d3f7313e07d880a831a8ca (patch) | |
| tree | 3f5d051bdc34b49ecdf0662ef114c5e9a9db3d26 /rpki/irdb | |
| parent | 885e93c30e123bb9350ef94b14602cf4c4f94a40 (diff) | |
Pull from trunk.
svn path=/branches/tk705/; revision=6036
Diffstat (limited to 'rpki/irdb')
| -rw-r--r-- | rpki/irdb/zookeeper.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rpki/irdb/zookeeper.py b/rpki/irdb/zookeeper.py index bcdfaf7e..9a843a4e 100644 --- a/rpki/irdb/zookeeper.py +++ b/rpki/irdb/zookeeper.py @@ -192,7 +192,7 @@ class Zookeeper(object): show_xml = None - def __init__(self, cfg = None, handle = None, logstream = None): + def __init__(self, cfg = None, handle = None, logstream = None, disable_signal_handlers = False): if cfg is None: cfg = rpki.config.parser() @@ -203,6 +203,7 @@ class Zookeeper(object): self.cfg = cfg self.logstream = logstream + self.disable_signal_handlers = disable_signal_handlers self.run_rpkid = cfg.getboolean("run_rpkid", section = myrpki_section) self.run_pubd = cfg.getboolean("run_pubd", section = myrpki_section) @@ -1066,7 +1067,6 @@ class Zookeeper(object): if not suppress_error_check: self.check_error_report(r_msg) - return r_msg |