From 2f20729e0514aa9f5ccd3a81d2f3ed68e7d8958e Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Tue, 5 May 2015 12:41:02 -0400
Subject: [PATCH 1/3] Small update to wording in install help

---
 install | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install b/install
index 714b01c0a..e5c329903 100755
--- a/install
+++ b/install
@@ -22,9 +22,9 @@ showhelp () {
                 No output except errors
     -f, --force
                 Turn off interactive prompts
-    --distribution
+    --distribution=DISTRIBUTION
                 Linux distribution the installation is being run on
-    --release
+    --release=RELEASE
                 Distribution release
     -d, --ignore-dependencies
                 Don't install binary dependencies

From 196e08fc90a6ad099ed2912b42fb5f68b4ed8adc Mon Sep 17 00:00:00 2001
From: Duncan Sommerville <duncan.sommerville@gmail.com>
Date: Thu, 21 May 2015 12:49:26 -0400
Subject: [PATCH 2/3] Fix bug where users can't connect to Master source due to
 hardcoded path in liquidsoap

---
 python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py | 3 +++
 python_apps/pypo/liquidsoap/ls_script.liq              | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py b/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
index 1b409b3c5..d8eb275dd 100644
--- a/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
+++ b/python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
@@ -1,4 +1,5 @@
 import logging
+import os
 import sys
 import time
 import traceback
@@ -23,7 +24,9 @@ def generate_liquidsoap_config(ss):
         str_buffer = "%s = %s\n" % (key, val)
         fh.write(str_buffer.encode('utf-8'))
 
+    auth_path = os.path.dirname(os.path.realpath(__file__))
     fh.write('log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"\n')
+    fh.write('auth_path = "%s/liquidsoap_auth.py"\n' % auth_path)
     fh.close()
     
 def run():
diff --git a/python_apps/pypo/liquidsoap/ls_script.liq b/python_apps/pypo/liquidsoap/ls_script.liq
index e4c2aa9d7..632cf6324 100644
--- a/python_apps/pypo/liquidsoap/ls_script.liq
+++ b/python_apps/pypo/liquidsoap/ls_script.liq
@@ -3,7 +3,7 @@
 set("log.file.path", log_file)
 set("server.telnet", true)
 set("server.telnet.port", 1234)
-set("init.daemon.pidfile.path", "/var/run/airtime/airtime-liquidsoap.pid")
+# set("init.daemon.pidfile.path", "/var/run/airtime/airtime-liquidsoap.pid")
 
 %include "library/pervasives.liq"
 
@@ -213,7 +213,7 @@ end
 def check_master_dj_client(user,password) =
     log("master connected")
     #get the output of the php script
-    ret = get_process_lines("python /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_auth.py --master #{user} #{password}")
+    ret = get_process_lines("python #{auth_path} --master #{user} #{password}")
     #ret has now the value of the live client (dj1,dj2, or djx), or "ERROR"/"unknown" ...
     ret = list.hd(ret)
 
@@ -224,7 +224,7 @@ end
 def check_dj_client(user,password) =
     log("live dj connected")
     #get the output of the php script
-    ret = get_process_lines("python /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_auth.py --dj #{user} #{password}")
+    ret = get_process_lines("python #{auth_path} --dj #{user} #{password}")
     #ret has now the value of the live client (dj1,dj2, or djx), or "ERROR"/"unknown" ...
     hd = list.hd(ret)
     log("Live DJ authenticated: #{hd}")

From 027adc7749a027154c063c738e12fc1206d204ed Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Fri, 22 May 2015 18:20:45 -0400
Subject: [PATCH 3/3] 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', []),