CC-3691: Pypo needs to write stderr + stdout to the log file

-fixed

install_minimal/include/airtime-copy-files.sh

@@ -69,6 +69,7 @@ fi
 
 mkdir -p /usr/lib/airtime
 cp -R $AIRTIMEROOT/utils /usr/lib/airtime
+cp -R $AIRTIMEROOT/python_apps/std_err_override /usr/lib/airtime
 
 echo "* Creating symbolic links in /usr/bin"
 #create symbolic links

python_apps/media-monitor/MediaMonitor.py

@@ -6,6 +6,7 @@ import os
 import signal
 
 from api_clients import api_client as apc
+from std_err_override import LogWriter
 
 from multiprocessing import Process, Queue as mpQueue
 
@@ -23,12 +24,17 @@ from airtimefilemonitor.airtimemediamonitorbootstrap import AirtimeMediaMonitorB
 # configure logging
 try:
     logging.config.fileConfig("logging.cfg")
+    
+    #need to wait for Python 2.7 for this..
+    #logging.captureWarnings(True)
+    
+    logger = logging.getLogger()
+    LogWriter.override_std_err(logger)
+    
 except Exception, e:
     print 'Error configuring logging: ', e
     sys.exit(1)
 
-logger = logging.getLogger()
-
 logger.info("\n\n*** Media Monitor bootup ***\n\n")
 
 try:

python_apps/pypo/pypo-notify.py

@@ -36,6 +36,7 @@ from configobj import ConfigObj
 # custom imports
 #from util import *
 from api_clients import *
+from std_err_override import LogWriter
 
 # Set up command-line options
 parser = OptionParser()
@@ -59,13 +60,18 @@ parser.add_option("-y", "--source-status", help="source connection stauts", meta
 
 # configure logging
 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)
 
 # loading config file
 try:
     config = ConfigObj('/etc/airtime/pypo.cfg')
     
 except Exception, e:
-    print 'error: ', e
+    logger.error('Error loading config file: %s', e)
     sys.exit()
     
         

python_apps/pypo/pypocli.py

@@ -23,6 +23,7 @@ from configobj import ConfigObj
 
 # custom imports
 from api_clients import api_client
+from std_err_override import LogWriter
 
 PYPO_VERSION = '1.1'
 
@@ -45,12 +46,16 @@ parser.add_option("-c", "--check", help="Check the cached schedule and exit", de
 
 # configure logging
 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)
 
 # loading config file
 try:
     config = ConfigObj('/etc/airtime/pypo.cfg')
 except Exception, e:
-    logger = logging.getLogger()
     logger.error('Error loading config file: %s', e)
     sys.exit()
 

python_apps/pypo/pypofetch.py

@@ -10,11 +10,17 @@ import copy
 from threading import Thread
 
 from api_clients import api_client
+from std_err_override import LogWriter
 
 from configobj import ConfigObj
 
 # configure logging
 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)
 
 # loading config file
 try:
@@ -24,7 +30,6 @@ try:
     POLL_INTERVAL = int(config['poll_interval'])
 
 except Exception, e:
-    logger = logging.getLogger()
     logger.error('Error loading config file: %s', e)
     sys.exit()
 

python_apps/pypo/pypofile.py

@@ -8,8 +8,15 @@ import shutil
 import os
 import sys
 
+from std_err_override import LogWriter
+
 # configure logging
 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)
 
 # loading config file
 try:
@@ -19,7 +26,6 @@ try:
     POLL_INTERVAL = int(config['poll_interval'])
 
 except Exception, e:
-    logger = logging.getLogger()
     logger.error('Error loading config file: %s', e)
     sys.exit(1)
 

python_apps/pypo/pypomessagehandler.py

@@ -10,8 +10,15 @@ from kombu.messaging import Exchange, Queue
 from kombu.simple import SimpleQueue
 import json
 
+from std_err_override import LogWriter
+
 # configure logging
 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)
 
 # loading config file
 try:
@@ -21,7 +28,6 @@ try:
     POLL_INTERVAL = int(config['poll_interval'])
 
 except Exception, e:
-    logger = logging.getLogger('message_h')
     logger.error('Error loading config file: %s', e)
     sys.exit()
 

python_apps/pypo/pypopush.py

@@ -16,11 +16,17 @@ from Queue import Empty
 from threading import Thread
 
 from api_clients import api_client
+from std_err_override import LogWriter
 from configobj import ConfigObj
 
 
 # configure logging
 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)
 
 # loading config file
 try:
@@ -30,7 +36,6 @@ try:
     PUSH_INTERVAL = 2
     MAX_LIQUIDSOAP_QUEUE_LENGTH = 2
 except Exception, e:
-    logger = logging.getLogger()
     logger.error('Error loading config file %s', e)
     sys.exit()
 

python_apps/std_err_override/LogWriter.py

@@ -0,0 +1,11 @@
+import sys
+
+class LogWriter():
+    def __init__(self, logger):
+        self.logger = logger
+    
+    def write(self, txt):
+        self.logger.error(txt)
+
+def override_std_err(logger):
+    sys.stderr = LogWriter(logger)