From 721c3638d6a60531f152cd48d255b8c1ae0044cf Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 18 Oct 2012 10:17:42 -0400 Subject: fixed server core instantiation when running in foreground --- src/lib/Bcfg2/Server/BuiltinCore.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/Server/BuiltinCore.py b/src/lib/Bcfg2/Server/BuiltinCore.py index 8eb8806bc..e7931b844 100644 --- a/src/lib/Bcfg2/Server/BuiltinCore.py +++ b/src/lib/Bcfg2/Server/BuiltinCore.py @@ -29,13 +29,17 @@ class Core(BaseCore): #: this server core self.server = None - #: The :class:`daemon.DaemonContext` used to drop privileges, - #: write the PID file (with :class:`PidFile`), and daemonize - #: this core. - self.context = \ - daemon.DaemonContext(uid=self.setup['daemon_uid'], - gid=self.setup['daemon_gid'], - pidfile=PIDLockFile(self.setup['daemon'])) + if self.setup['daemon']: + #: The :class:`daemon.DaemonContext` used to drop + #: privileges, write the PID file (with :class:`PidFile`), + #: and daemonize this core. + self.context = \ + daemon.DaemonContext(uid=self.setup['daemon_uid'], + gid=self.setup['daemon_gid'], + pidfile=PIDLockFile(self.setup['daemon'])) + else: + self.context = daemon.DaemonContext(uid=self.setup['daemon_uid'], + gid=self.setup['daemon_gid']) __init__.__doc__ = BaseCore.__init__.__doc__.split('.. -----')[0] def _dispatch(self, method, args, dispatch_dict): -- cgit v1.2.3-1-g7c22