cloud-init-dev team mailing list archive

[Joshua Harlow <harlowja@xxxxxxxxx>]

Joshua Harlow has proposed merging lp:~harlowja/cloud-init/signal-handling-nicenesss into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~harlowja/cloud-init/signal-handling-nicenesss/+merge/123680
-- 
https://code.launchpad.net/~harlowja/cloud-init/signal-handling-nicenesss/+merge/123680
Your team cloud init development team is requested to review the proposed merge of lp:~harlowja/cloud-init/signal-handling-nicenesss into lp:cloud-init.

=== modified file 'bin/cloud-init'
--- bin/cloud-init	2012-08-10 03:48:01 +0000
+++ bin/cloud-init	2012-09-11 05:20:24 +0000
@@ -35,6 +35,7 @@
 
 from cloudinit import log as logging
 from cloudinit import netinfo
+from cloudinit import signal_handler
 from cloudinit import sources
 from cloudinit import stages
 from cloudinit import templater
@@ -494,6 +495,9 @@
     if args.debug:
         logging.setupBasicLogging()
 
+    # Setup signal handlers before running
+    signal_handler.attach_handlers()
+
     (name, functor) = args.action
     return functor(name, args)
 

=== added file 'cloudinit/signal_handler.py'
--- cloudinit/signal_handler.py	1970-01-01 00:00:00 +0000
+++ cloudinit/signal_handler.py	2012-09-11 05:20:24 +0000
@@ -0,0 +1,66 @@
+# vi: ts=4 expandtab
+#
+#    Copyright (C) 2012 Canonical Ltd.
+#    Copyright (C) 2012 Yahoo! Inc.
+#
+#    Author: Scott Moser <scott.moser@xxxxxxxxxxxxx>
+#    Author: Joshua Harlow <harlowja@xxxxxxxxxxxxx>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import inspect
+import signal
+import sys
+
+from StringIO import StringIO
+
+from cloudinit import util
+from cloudinit import version as vr
+
+
+EXIT_FOR = {
+    signal.SIGINT: ('Cloud-init %(version)s interrupted, exiting...', 1),
+    signal.SIGTERM: ('Cloud-init %(version)s terminated, exiting...', 1),
+    # Can't be caught...
+    # signal.SIGKILL: ('Cloud-init killed, exiting...', 1),
+    signal.SIGABRT: ('Cloud-init %(version)s aborted, exiting...', 1),
+}
+
+
+def _pprint_frame(frame, depth=1, max_depth=3):
+    if depth > max_depth or not frame:
+        return
+    frame_info = inspect.getframeinfo(frame)
+    prefix = " " * (depth * 2)
+    contents = StringIO()
+    contents.write("%sFilename: %s\n" % (prefix, frame_info.filename))
+    contents.write("%sFunction: %s\n" % (prefix, frame_info.function))
+    contents.write("%sLine number: %s\n" % (prefix, frame_info.lineno))
+    util.multi_log(contents.getvalue())
+    _pprint_frame(frame.f_back, depth + 1, max_depth)
+
+
+def _handle_exit(signum, frame):
+    (msg, rc) = EXIT_FOR[signum]
+    msg = msg % ({'version': vr.version()})
+    util.multi_log("%s\n" % (msg))
+    _pprint_frame(frame)
+    sys.exit(rc)
+
+
+def attach_handlers():
+    sigs_attached = 0
+    for signum in EXIT_FOR.keys():
+        signal.signal(signum, _handle_exit)
+    sigs_attached += len(EXIT_FOR)
+    return sigs_attached