ovs.fatal_signal: Reorder definitions to be more easily readable.
authorBen Pfaff <blp@nicira.com>
Tue, 23 Aug 2011 17:29:40 +0000 (10:29 -0700)
committerBen Pfaff <blp@nicira.com>
Wed, 24 Aug 2011 18:57:44 +0000 (11:57 -0700)
Suggested-by: Reid Price <reid@nicira.com>
python/ovs/fatal_signal.py

index 5fca820e6a766399c4c32704e2f2b6d3124ecda5..839df32bb695d38754332704ae9dede0919214cf 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 Nicira Networks
+# Copyright (c) 2010, 2011 Nicira Networks
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,20 +17,8 @@ import logging
 import os
 import signal
 
 import os
 import signal
 
-_inited = False
 _hooks = []
 
 _hooks = []
 
-def _init():
-    global _inited
-    if not _inited:
-        _inited = True
-
-        for signr in (signal.SIGTERM, signal.SIGINT,
-                      signal.SIGHUP, signal.SIGALRM):
-            if signal.getsignal(signr) == signal.SIG_DFL:
-                signal.signal(signr, _signal_handler)
-        atexit.register(_atexit_handler)
-
 def add_hook(hook, cancel, run_at_exit):
     _init()
 
 def add_hook(hook, cancel, run_at_exit):
     _init()
 
@@ -119,3 +107,15 @@ def _call_hooks(signr):
     for hook, cancel, run_at_exit in _hooks:
         if signr != 0 or run_at_exit:
             hook()
     for hook, cancel, run_at_exit in _hooks:
         if signr != 0 or run_at_exit:
             hook()
+
+_inited = False
+def _init():
+    global _inited
+    if not _inited:
+        _inited = True
+
+        for signr in (signal.SIGTERM, signal.SIGINT,
+                      signal.SIGHUP, signal.SIGALRM):
+            if signal.getsignal(signr) == signal.SIG_DFL:
+                signal.signal(signr, _signal_handler)
+        atexit.register(_atexit_handler)