moved logging logic to launcher

This commit is contained in:
Rudi Grinberg 2012-11-15 15:02:26 -05:00
parent 11a43eb891
commit 350c6e2f94
2 changed files with 17 additions and 18 deletions

View File

@ -1,8 +1,13 @@
import os, sys import os, sys
import logging
import logging.config
from media.monitor.exceptions import FailedToObtainLocale, \ from media.monitor.exceptions import FailedToObtainLocale, \
FailedToSetLocale 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.saas.thread import InstanceThread, user, apc
from media.monitor.log import Loggable from media.monitor.log import Loggable
import media.monitor.pure as mmp import media.monitor.pure as mmp
@ -103,3 +108,14 @@ def setup_global(log):
log.info("Failed to set the locale for unknown reason. \ log.info("Failed to set the locale for unknown reason. \
Logging exception.") Logging exception.")
log.info(str(e)) 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

View File

@ -1,26 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import sys import sys
import os import os
import logging from media.saas.launcher import setup_global, launch_instance, setup_logger
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.monitor.config import MMConfig 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): def main(global_config, api_client_config, log_config):
""" function to run hosted install """ """ function to run hosted install """
mm_config = MMConfig(global_config) mm_config = MMConfig(global_config)