let SystemExit exception go up to the surface so we can exit() and so freeze the...

diff --git a/database.py b/database.py
index 7064335..2c4dc49 100644 (file)
--- a/database.py
+++ b/database.py
@@ -13,6 +13,8 @@ In order to maintain service when the node reboots during a network
 partition, the database is constantly being dumped to disk.
 """
 
 partition, the database is constantly being dumped to disk.
 """
 

+import sys
+

 import cPickle
 import threading
 import time
 import cPickle
 import threading
 import time


@@ -156,6 +158,8 @@ It may be necessary in the future to do something smarter."""
                     if sliver.is_running():
                         logger.verbose ("database: sync : ensure_create'ing 'delegated' sliver %s"%name)
                         sliver.ensure_created(rec)
                     if sliver.is_running():
                         logger.verbose ("database: sync : ensure_create'ing 'delegated' sliver %s"%name)
                         sliver.ensure_created(rec)

+            except SystemExit as e:
+                sys.exit(e)

             except:
                 logger.log_exc("database: sync failed to handle sliver",name=name)
 
             except:
                 logger.log_exc("database: sync failed to handle sliver",name=name)
 

diff --git a/nodemanager.py b/nodemanager.py
index 7f5e204..0d3009d 100755 (executable)
--- a/nodemanager.py
+++ b/nodemanager.py
@@ -117,6 +117,8 @@ class NodeManager:
                 if getattr(module,'persistent_data',False):
                     module_data=last_data
                 callback(data, config, plc)
                 if getattr(module,'persistent_data',False):
                     module_data=last_data
                 callback(data, config, plc)

+            except SystemExit as e:
+                sys.exit(e)

             except:
                 logger.log_exc("nodemanager: GetSlivers failed to run callback for module %r"%module)
 
             except:
                 logger.log_exc("nodemanager: GetSlivers failed to run callback for module %r"%module)