From 027adc7749a027154c063c738e12fc1206d204ed Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Fri, 22 May 2015 18:20:45 -0400 Subject: [PATCH] Three bugfixes * Removed Support Settings nav link * SAAS-801: pypo log configuration files are overkill and must be removed * CC-6043: CTRL-C doesn't work in pypo / airtime-playout --- .../application/configs/navigation.php | 6 -- python_apps/pypo/bin/pyponotify | 21 +++++-- python_apps/pypo/install/notify_logging.cfg | 28 --------- python_apps/pypo/install/pypo_logging.cfg | 58 ------------------- python_apps/pypo/pypo/__main__.py | 22 +++++-- python_apps/pypo/pypo/pypofetch.py | 6 -- python_apps/pypo/pypo/pypofile.py | 6 +- python_apps/pypo/pypo/pypomessagehandler.py | 6 -- python_apps/pypo/pypo/pypopush.py | 6 -- python_apps/pypo/setup.py | 2 - 10 files changed, 35 insertions(+), 126 deletions(-) delete mode 100644 python_apps/pypo/install/notify_logging.cfg delete mode 100644 python_apps/pypo/install/pypo_logging.cfg diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php index 21a603900..372266de8 100644 --- a/airtime_mvc/application/configs/navigation.php +++ b/airtime_mvc/application/configs/navigation.php @@ -66,12 +66,6 @@ $pages = array( 'controller' => 'Preference', 'action' => 'stream-setting' ), - array( - 'label' => _('Support Feedback'), - 'module' => 'default', - 'controller' => 'Preference', - 'action' => 'support-setting' - ), array( 'label' => _('Status'), 'module' => 'default', diff --git a/python_apps/pypo/bin/pyponotify b/python_apps/pypo/bin/pyponotify index e9a8e864f..d49181471 100755 --- a/python_apps/pypo/bin/pyponotify +++ b/python_apps/pypo/bin/pyponotify @@ -30,6 +30,9 @@ from configobj import ConfigObj from api_clients import * from std_err_override import LogWriter +LOG_LEVEL = logging.INFO +LOG_PATH = '/var/log/airtime/pypo/notify.log' + # help screeen / info usage = "%prog [options]" + " - notification gateway" parser = OptionParser(usage=usage) @@ -50,10 +53,20 @@ parser.add_option("-n", "--liquidsoap-started", help="notify liquidsoap started" # parse options (options, args) = parser.parse_args() -# configure logging -logging.config.fileConfig('/etc/airtime/notify_logging.cfg') -logger = logging.getLogger('notify') -LogWriter.override_std_err(logger) +# Set up logging +logFormatter = logging.Formatter("%(asctime)s [%(module)s] [%(levelname)-5.5s] %(message)s") +rootLogger = logging.getLogger() +rootLogger.setLevel(LOG_LEVEL) + +fileHandler = logging.handlers.RotatingFileHandler(filename=LOG_PATH, maxBytes=1024*1024*30, + backupCount=8) +fileHandler.setFormatter(logFormatter) +rootLogger.addHandler(fileHandler) + +consoleHandler = logging.StreamHandler() +consoleHandler.setFormatter(logFormatter) +rootLogger.addHandler(consoleHandler) +logger = rootLogger #need to wait for Python 2.7 for this.. #logging.captureWarnings(True) diff --git a/python_apps/pypo/install/notify_logging.cfg b/python_apps/pypo/install/notify_logging.cfg deleted file mode 100644 index 30eddc2f4..000000000 --- a/python_apps/pypo/install/notify_logging.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[loggers] -keys=root,notify - -[handlers] -keys=notify - -[formatters] -keys=simpleFormatter - -[logger_root] -level=DEBUG -handlers=notify - -[logger_notify] -level=DEBUG -handlers=notify -qualname=notify -propagate=0 - -[handler_notify] -class=logging.handlers.RotatingFileHandler -level=DEBUG -formatter=simpleFormatter -args=("/var/log/airtime/pypo/notify.log", 'a', 1000000, 5,) - -[formatter_simpleFormatter] -format=%(asctime)s %(levelname)s - [%(filename)s : %(funcName)s() : line %(lineno)d] - %(message)s -datefmt= diff --git a/python_apps/pypo/install/pypo_logging.cfg b/python_apps/pypo/install/pypo_logging.cfg deleted file mode 100644 index 4c1ddd172..000000000 --- a/python_apps/pypo/install/pypo_logging.cfg +++ /dev/null @@ -1,58 +0,0 @@ -[loggers] -keys=root,fetch,push,recorder,message_h - -[handlers] -keys=pypo,recorder,message_h - -[formatters] -keys=simpleFormatter - -[logger_root] -level=DEBUG -handlers=pypo - -[logger_fetch] -level=DEBUG -handlers=pypo -qualname=fetch -propagate=0 - -[logger_push] -level=DEBUG -handlers=pypo -qualname=push -propagate=0 - -[logger_recorder] -level=DEBUG -handlers=recorder -qualname=recorder -propagate=0 - -[logger_message_h] -level=DEBUG -handlers=message_h -qualname=message_h -propagate=0 - -[handler_pypo] -class=logging.handlers.RotatingFileHandler -level=DEBUG -formatter=simpleFormatter -args=("/var/log/airtime/pypo/pypo.log", 'a', 5000000, 10,) - -[handler_recorder] -class=logging.handlers.RotatingFileHandler -level=DEBUG -formatter=simpleFormatter -args=("/var/log/airtime/pypo/show-recorder.log", 'a', 1000000, 5,) - -[handler_message_h] -class=logging.handlers.RotatingFileHandler -level=DEBUG -formatter=simpleFormatter -args=("/var/log/airtime/pypo/message-handler.log", 'a', 1000000, 5,) - -[formatter_simpleFormatter] -format=%(asctime)s %(levelname)s - [%(filename)s : %(funcName)s() : line %(lineno)d] - %(message)s -datefmt= diff --git a/python_apps/pypo/pypo/__main__.py b/python_apps/pypo/pypo/__main__.py index 0b1dc5c4f..1cec03761 100644 --- a/python_apps/pypo/pypo/__main__.py +++ b/python_apps/pypo/pypo/__main__.py @@ -34,9 +34,12 @@ from configobj import ConfigObj # custom imports from api_clients import api_client -from std_err_override import LogWriter +#from std_err_override import LogWriter import pure +LOG_PATH = '/var/log/airtime/pypo/pypo.log' +LOG_LEVEL = logging.INFO + # Set up command-line options parser = OptionParser() @@ -89,9 +92,15 @@ logging.captureWarnings(True) # configure logging try: - logging.config.fileConfig("/etc/airtime/pypo_logging.cfg") - logger = logging.getLogger() - LogWriter.override_std_err(logger) + # Set up logging + logFormatter = logging.Formatter("%(asctime)s [%(module)s] [%(levelname)-5.5s] %(message)s") + rootLogger = logging.getLogger() + rootLogger.setLevel(LOG_LEVEL) + logger = rootLogger + + consoleHandler = logging.StreamHandler() + consoleHandler.setFormatter(logFormatter) + rootLogger.addHandler(consoleHandler) except Exception, e: print "Couldn't configure logging", e sys.exit(1) @@ -301,6 +310,9 @@ if __name__ == '__main__': stat.daemon = True stat.start() - pf.join() + # Just sleep the main thread, instead of blocking on pf.join(). + # This allows CTRL-C to work! + while True: + time.sleep(1) logger.info("System exit") diff --git a/python_apps/pypo/pypo/pypofetch.py b/python_apps/pypo/pypo/pypofetch.py index 4bf68eba6..4c217e34f 100644 --- a/python_apps/pypo/pypo/pypofetch.py +++ b/python_apps/pypo/pypo/pypofetch.py @@ -22,12 +22,6 @@ from std_err_override import LogWriter from timeout import ls_timeout -# configure logging -logging_cfg = "/etc/airtime/pypo_logging.cfg" -logging.config.fileConfig(logging_cfg) -logger = logging.getLogger() -LogWriter.override_std_err(logger) - def keyboardInterruptHandler(signum, frame): logger = logging.getLogger() logger.info('\nKeyboard Interrupt\n') diff --git a/python_apps/pypo/pypo/pypofile.py b/python_apps/pypo/pypo/pypofile.py index f29811a25..b1cf676cc 100644 --- a/python_apps/pypo/pypo/pypofile.py +++ b/python_apps/pypo/pypo/pypofile.py @@ -11,11 +11,7 @@ import stat from std_err_override import LogWriter -# configure logging -logging_cfg = "/etc/airtime/pypo_logging.cfg" -logging.config.fileConfig(logging_cfg) -logger = logging.getLogger() -LogWriter.override_std_err(logger) +CONFIG_PATH = '/etc/airtime/airtime.conf' #need to wait for Python 2.7 for this.. #logging.captureWarnings(True) diff --git a/python_apps/pypo/pypo/pypomessagehandler.py b/python_apps/pypo/pypo/pypomessagehandler.py index a906f3a1a..8fdb43d9a 100644 --- a/python_apps/pypo/pypo/pypomessagehandler.py +++ b/python_apps/pypo/pypo/pypomessagehandler.py @@ -15,12 +15,6 @@ import json from std_err_override import LogWriter -# configure logging -logging_cfg = "/etc/airtime/pypo_logging.cfg" -logging.config.fileConfig(logging_cfg) -logger = logging.getLogger('message_h') -LogWriter.override_std_err(logger) - #need to wait for Python 2.7 for this.. #logging.captureWarnings(True) diff --git a/python_apps/pypo/pypo/pypopush.py b/python_apps/pypo/pypo/pypopush.py index ac33fcec8..48d3cd13f 100644 --- a/python_apps/pypo/pypo/pypopush.py +++ b/python_apps/pypo/pypo/pypopush.py @@ -25,12 +25,6 @@ from std_err_override import LogWriter from timeout import ls_timeout -# configure logging -logging_cfg = "/etc/airtime/pypo_logging.cfg" -logging.config.fileConfig(logging_cfg) -logger = logging.getLogger() -LogWriter.override_std_err(logger) - #need to wait for Python 2.7 for this.. #logging.captureWarnings(True) diff --git a/python_apps/pypo/setup.py b/python_apps/pypo/setup.py index 215cc8a0e..a569e35e2 100644 --- a/python_apps/pypo/setup.py +++ b/python_apps/pypo/setup.py @@ -22,8 +22,6 @@ else: ('/etc/init', ['install/upstart/airtime-liquidsoap.conf.template']), ('/etc/init.d', ['install/sysvinit/airtime-playout']), ('/etc/init.d', ['install/sysvinit/airtime-liquidsoap']), - ('/etc/airtime', ['install/notify_logging.cfg']), - ('/etc/airtime', ['install/pypo_logging.cfg']), ('/var/log/airtime/pypo', []), ('/var/log/airtime/pypo-liquidsoap', []), ('/var/tmp/airtime/pypo', []),