From 350c6e2f94a1faa62f8afc5f18037a7f4390ef31 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@gmail.com>
Date: Thu, 15 Nov 2012 15:02:26 -0500
Subject: [PATCH] moved logging logic to launcher
---
.../media-monitor2/media/saas/launcher.py | 16 ++++++++++++++++
python_apps/media-monitor2/mm2.py | 19 +------------------
2 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/python_apps/media-monitor2/media/saas/launcher.py b/python_apps/media-monitor2/media/saas/launcher.py
index 822307a0b..07d3a65cf 100644
--- a/python_apps/media-monitor2/media/saas/launcher.py
+++ b/python_apps/media-monitor2/media/saas/launcher.py
@@ -1,8 +1,13 @@
import os, sys
+import logging
+import logging.config
from media.monitor.exceptions import FailedToObtainLocale, \
FailedToSetLocale
+from media.monitor.log import get_logger, setup_logging
+from std_err_override import LogWriter
+
from media.saas.thread import InstanceThread, user, apc
from media.monitor.log import Loggable
import media.monitor.pure as mmp
@@ -103,3 +108,14 @@ def setup_global(log):
log.info("Failed to set the locale for unknown reason. \
Logging exception.")
log.info(str(e))
+
+def setup_logger(log_config, logpath):
+ logging.config.fileConfig(log_config)
+ #need to wait for Python 2.7 for this..
+ #logging.captureWarnings(True)
+ logger = logging.getLogger()
+ LogWriter.override_std_err(logger)
+ logfile = unicode(logpath)
+ setup_logging(logfile)
+ log = get_logger()
+ return log
diff --git a/python_apps/media-monitor2/mm2.py b/python_apps/media-monitor2/mm2.py
index 3e8c43e72..4a0402fff 100644
--- a/python_apps/media-monitor2/mm2.py
+++ b/python_apps/media-monitor2/mm2.py
@@ -1,26 +1,9 @@
# -*- coding: utf-8 -*-
import sys
import os
-import logging
-import logging.config
-
-from media.monitor.log import get_logger, setup_logging
-from std_err_override import LogWriter
-from media.saas.launcher import setup_global, launch_instance
-from media.saas.airtimeinstance import AirtimeInstance
+from media.saas.launcher import setup_global, launch_instance, setup_logger
from media.monitor.config import MMConfig
-def setup_logger(log_config, logpath):
- logging.config.fileConfig(log_config)
- #need to wait for Python 2.7 for this..
- #logging.captureWarnings(True)
- logger = logging.getLogger()
- LogWriter.override_std_err(logger)
- logfile = unicode(logpath)
- setup_logging(logfile)
- log = get_logger()
- return log
-
def main(global_config, api_client_config, log_config):
""" function to run hosted install """
mm_config = MMConfig(global_config)