From cca9ba0c360074316438864a4f6795c98908b464 Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Thu, 12 Mar 2015 19:09:00 -0400
Subject: [PATCH] Fixed pypo config file loading

---
 python_apps/pypo/pypo/__main__.py           | 4 ++--
 python_apps/pypo/pypo/pypofetch.py          | 2 +-
 python_apps/pypo/pypo/pypofile.py           | 3 ++-
 python_apps/pypo/pypo/pypomessagehandler.py | 3 ++-
 python_apps/pypo/pypo/pypopush.py           | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/python_apps/pypo/pypo/__main__.py b/python_apps/pypo/pypo/__main__.py
index 7ebef7554..0b1dc5c4f 100644
--- a/python_apps/pypo/pypo/__main__.py
+++ b/python_apps/pypo/pypo/__main__.py
@@ -89,11 +89,11 @@ logging.captureWarnings(True)
 
 # configure logging
 try:
-    logging.config.fileConfig("%s/logging.cfg" % os.path.dirname(os.path.realpath(__file__)))
+    logging.config.fileConfig("/etc/airtime/pypo_logging.cfg")
     logger = logging.getLogger()
     LogWriter.override_std_err(logger)
 except Exception, e:
-    print "Couldn't configure logging"
+    print "Couldn't configure logging", e
     sys.exit(1)
 
 def configure_locale():
diff --git a/python_apps/pypo/pypo/pypofetch.py b/python_apps/pypo/pypo/pypofetch.py
index d7c79b581..4bf68eba6 100644
--- a/python_apps/pypo/pypo/pypofetch.py
+++ b/python_apps/pypo/pypo/pypofetch.py
@@ -23,7 +23,7 @@ from timeout import ls_timeout
 
 
 # configure logging
-logging_cfg = os.path.join(os.path.dirname(__file__), "logging.cfg")
+logging_cfg = "/etc/airtime/pypo_logging.cfg"
 logging.config.fileConfig(logging_cfg)
 logger = logging.getLogger()
 LogWriter.override_std_err(logger)
diff --git a/python_apps/pypo/pypo/pypofile.py b/python_apps/pypo/pypo/pypofile.py
index 7540a25b5..f29811a25 100644
--- a/python_apps/pypo/pypo/pypofile.py
+++ b/python_apps/pypo/pypo/pypofile.py
@@ -12,7 +12,8 @@ import stat
 from std_err_override import LogWriter
 
 # configure logging
-logging.config.fileConfig("%s/logging.cfg" % os.path.dirname(os.path.realpath(__file__)))
+logging_cfg = "/etc/airtime/pypo_logging.cfg"
+logging.config.fileConfig(logging_cfg)
 logger = logging.getLogger()
 LogWriter.override_std_err(logger)
 
diff --git a/python_apps/pypo/pypo/pypomessagehandler.py b/python_apps/pypo/pypo/pypomessagehandler.py
index 62551b7d3..a906f3a1a 100644
--- a/python_apps/pypo/pypo/pypomessagehandler.py
+++ b/python_apps/pypo/pypo/pypomessagehandler.py
@@ -16,7 +16,8 @@ import json
 from std_err_override import LogWriter
 
 # configure logging
-logging.config.fileConfig("%s/logging.cfg" % os.path.dirname(os.path.realpath(__file__)))
+logging_cfg = "/etc/airtime/pypo_logging.cfg"
+logging.config.fileConfig(logging_cfg)
 logger = logging.getLogger('message_h')
 LogWriter.override_std_err(logger)
 
diff --git a/python_apps/pypo/pypo/pypopush.py b/python_apps/pypo/pypo/pypopush.py
index 75079ca1f..ac33fcec8 100644
--- a/python_apps/pypo/pypo/pypopush.py
+++ b/python_apps/pypo/pypo/pypopush.py
@@ -26,7 +26,7 @@ from timeout import ls_timeout
 
 
 # configure logging
-logging_cfg = os.path.join(os.path.dirname(__file__), "logging.cfg")
+logging_cfg = "/etc/airtime/pypo_logging.cfg"
 logging.config.fileConfig(logging_cfg)
 logger = logging.getLogger()
 LogWriter.override_std_err(logger)