Merge branch '2.5.x-installer' into saas-installer-albert

Conflicts:
	python_apps/pypo/pypo/pypofile.py

python_apps/pypo/pypo/__main__.py

@@ -31,9 +31,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()
 
@@ -86,9 +89,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)
@@ -294,6 +303,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")

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')

python_apps/pypo/pypo/pypofile.py

@@ -18,12 +18,6 @@ from std_err_override import LogWriter
 
 CONFIG_PATH = '/etc/airtime/airtime.conf'
 
-# 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)
 

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)
 

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)