summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-06-26 09:15:40 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-06-26 09:15:40 -0500
commit8b49d8b198564d0dae3e40b99b6f9d76188dcda7 (patch)
tree32215bc2e1354aff55e731875890554d315bed10 /src/lib
parent50e8555aac2830ca2b848003a811b1b418fd0f79 (diff)
downloadbcfg2-8b49d8b198564d0dae3e40b99b6f9d76188dcda7.tar.gz
bcfg2-8b49d8b198564d0dae3e40b99b6f9d76188dcda7.tar.bz2
bcfg2-8b49d8b198564d0dae3e40b99b6f9d76188dcda7.zip
Revert "Core: properly handle Ctrl-C"
This reverts commit 4568c44372c99ba809826e016680da9b881bd8e8. Trying to handle ^c in the core is difficult and can break STDOUT for interactive programs that invoke the core. Signed-off-by: Sol Jerome <sol.jerome@gmail.com> Conflicts: src/lib/Bcfg2/Server/Core.py src/sbin/bcfg2-test tools/bcfg2-profile-templates.py
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Bcfg2/Server/Core.py17
1 files changed, 4 insertions, 13 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index f44634d35..ecd68e1e4 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -2,15 +2,14 @@
implementations inherit from. """
import os
-import sys
import pwd
-import time
import atexit
-import select
-import signal
import logging
-import inspect
+import select
+import sys
import threading
+import time
+import inspect
import lxml.etree
import Bcfg2.settings
import Bcfg2.Server
@@ -244,14 +243,6 @@ class BaseCore(object):
#: The CA that signed the server cert
self.ca = setup['ca']
- def hdlr(sig, frame): # pylint: disable=W0613
- """ Handle SIGINT/Ctrl-C by shutting down the core and exiting
- properly. """
- self.shutdown()
- os._exit(1) # pylint: disable=W0212
-
- signal.signal(signal.SIGINT, hdlr)
-
#: The FAM :class:`threading.Thread`,
#: :func:`_file_monitor_thread`
self.fam_thread = \