zuul/nodepool
Code Issues Proposed changes

Revert "Refactor nodepool apps into base app"

Browse Source 
Logging is currently broken due to this change. Nothing is logged.

This reverts commit 03c41ccc35.

Change-Id: I7d8f1cd866b768326157f4503c1f729ebb703c0c
This commit is contained in:
David Shrewsbury
2017-03-20 15:00:30 +00:00
parent 03c41ccc35
commit 3dc2c40d8e
4 changed files with 124 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
nodepool/cmd/__init__.py
View File

@@ -14,10 +14,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import argparse
import daemon
import errno
import extras
import logging
import logging.config
import os
@@ -26,35 +22,6 @@ import sys
import threading
import traceback
from nodepool.version import version_info as npd_version_info
# as of python-daemon 1.6 it doesn't bundle pidlockfile anymore
# instead it depends on lockfile-0.9.1 which uses pidfile.
pid_file_module = extras.try_imports(['daemon.pidlockfile', 'daemon.pidfile'])
def is_pidfile_stale(pidfile):
""" Determine whether a PID file is stale.
Return 'True' ("stale") if the contents of the PID file are
valid but do not match the PID of a currently-running process;
otherwise return 'False'.
"""
result = False
pidfile_pid = pidfile.read_pid()
if pidfile_pid is not None:
try:
os.kill(pidfile_pid, 0)
except OSError as exc:
if exc.errno == errno.ESRCH:
# The specified PID does not exist
result = True
return result
def stack_dump_handler(signum, frame):
signal.signal(signal.SIGUSR2, signal.SIG_IGN)
@@ -78,91 +45,17 @@ def stack_dump_handler(signum, frame):
class NodepoolApp(object):
app_name = None
app_description = 'Node pool.'
def __init__(self):
self.args = None
def create_parser(self):
parser = argparse.ArgumentParser(description=self.app_description)
parser.add_argument('-l',
dest='logconfig',
help='path to log config file')
parser.add_argument('--version',
action='version',
version=npd_version_info.version_string())
return parser
def setup_logging(self):
if self.args.logconfig:
fp = os.path.expanduser(self.args.logconfig)
if not os.path.exists(fp):
m = "Unable to read logging config file at %s" % fp
raise Exception(m)
raise Exception("Unable to read logging config file at %s" %
fp)
logging.config.fileConfig(fp)
else:
m = '%(asctime)s %(levelname)s %(name)s: %(message)s'
logging.basicConfig(level=logging.DEBUG, format=m)
def _main(self, argv=None):
if argv is None:
argv = sys.argv[1:]
self.args = self.create_parser().parse_args()
self.setup_logging()
return self._do_run()
def _do_run(self):
return self.run()
@classmethod
def main(cls, argv=None):
return cls()._main(argv=argv)
def run(self):
"""The app's primary function, override it with your logic."""
raise NotImplementedError()
class NodepoolDaemonApp(NodepoolApp):
def create_parser(self):
parser = super(NodepoolDaemonApp, self).create_parser()
parser.add_argument('-p',
dest='pidfile',
help='path to pid file',
default='/var/run/nodepool/%s.pid' % self.app_name)
parser.add_argument('-d',
dest='nodaemon',
action='store_true',
help='do not run as a daemon')
return parser
def _do_run(self):
if self.args.nodaemon:
return super(NodepoolDaemonApp, self)._do_run()
else:
pid = pid_file_module.TimeoutPIDLockFile(self.args.pidfile, 10)
if is_pidfile_stale(pid):
pid.break_lock()
with daemon.DaemonContext(pidfile=pid):
return super(NodepoolDaemonApp, self)._do_run()
@classmethod
def main(cls, argv=None):
signal.signal(signal.SIGUSR2, stack_dump_handler)
return super(NodepoolDaemonApp, cls).main(argv)
logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s %(levelname)s %(name)s: '
'%(message)s')