summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Core.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-18 15:04:04 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-09-18 15:04:27 -0400
commitb9870f2e9293491a2f17b1c3bbd4e1bc2d505704 (patch)
treeb5d383d89e9be71c5a8925973b2cb45897b437a9 /src/lib/Bcfg2/Server/Core.py
parentb3dde5da6971834bcacba66fa6ece5c7879c4dd9 (diff)
downloadbcfg2-b9870f2e9293491a2f17b1c3bbd4e1bc2d505704.tar.gz
bcfg2-b9870f2e9293491a2f17b1c3bbd4e1bc2d505704.tar.bz2
bcfg2-b9870f2e9293491a2f17b1c3bbd4e1bc2d505704.zip
fixed gamin issues with late daemonization
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
-rw-r--r--src/lib/Bcfg2/Server/Core.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index cc6cf13a8..3fe52c4e9 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -27,10 +27,12 @@ except:
os.environ['DJANGO_SETTINGS_MODULE'] = 'Bcfg2.settings'
+
def exposed(func):
func.exposed = True
return func
+
class track_statistics(object):
""" decorator that tracks execution time for the given
function """
@@ -53,6 +55,7 @@ class track_statistics(object):
return inner
+
def sort_xml(node, key=None):
for child in node:
sort_xml(child, key)
@@ -99,7 +102,7 @@ class BaseCore(object):
fm = Bcfg2.Server.FileMonitor.available[setup['filemonitor']]
except KeyError:
self.logger.error("File monitor driver %s not available; "
- "forcing to default" % filemonitor)
+ "forcing to default" % setup['filemonitor'])
fm = Bcfg2.Server.FileMonitor.available['default']
famargs = dict(ignore=[], debug=False)
if 'ignore' in setup:
@@ -489,7 +492,7 @@ class BaseCore(object):
def _daemonize(self):
""" daemonize the server """
- raise NotImplementedError
+ raise NotImplementedError
def _run(self):
""" start up the server; this method should return immediately """