From 701a618896d80eb06a9e9d15084073346da699dd Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 7 Aug 2012 12:17:36 -0400
Subject: [PATCH] cc-4105: cleaned up config stuff

---
 python_apps/api_clients/api_client.cfg          | 4 ++++
 python_apps/media-monitor2/media/monitor/log.py | 8 ++++++--
 python_apps/media-monitor2/mm2.py               | 7 +++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/python_apps/api_clients/api_client.cfg b/python_apps/api_clients/api_client.cfg
index d6d3c13bc..5645f8cc3 100644
--- a/python_apps/api_clients/api_client.cfg
+++ b/python_apps/api_clients/api_client.cfg
@@ -51,6 +51,10 @@ set_storage_dir = 'set-storage-dir/format/json/api_key/%%api_key%%/path/%%path%%
 # URL to tell Airtime about file system mount change
 update_fs_mount = 'update-file-system-mount/format/json/api_key/%%api_key%%'
 
+# URL to commit multiple updates from media monitor at the same time
+
+reload_metadata_group = 'reload-metadata-group/format/json/api_key/%%api_key%%'
+
 # URL to tell Airtime about file system mount change
 handle_watched_dir_missing = 'handle-watched-dir-missing/format/json/api_key/%%api_key%%/dir/%%dir%%'
 
diff --git a/python_apps/media-monitor2/media/monitor/log.py b/python_apps/media-monitor2/media/monitor/log.py
index abec8126a..d01a96881 100644
--- a/python_apps/media-monitor2/media/monitor/log.py
+++ b/python_apps/media-monitor2/media/monitor/log.py
@@ -3,8 +3,12 @@ import abc
 import traceback
 from media.monitor.pure import LazyProperty
 
-logger = logging.getLogger('mediamonitor2')
-logging.basicConfig(filename='/home/rudi/throwaway/mm2.log', level=logging.DEBUG)
+logfile = '/home/rudi/throwaway/mm2.log'
+#logger = None
+
+def setup_logging(log_path):
+    #logger = logging.getLogger('mediamonitor2')
+    logging.basicConfig(filename=log_path, level=logging.DEBUG)
 
 appname = 'mediamonitor2'
 
diff --git a/python_apps/media-monitor2/mm2.py b/python_apps/media-monitor2/mm2.py
index b2bf974b1..7e24fb45b 100644
--- a/python_apps/media-monitor2/mm2.py
+++ b/python_apps/media-monitor2/mm2.py
@@ -4,7 +4,7 @@ import os
 
 from media.monitor.manager import Manager
 from media.monitor.bootstrap import Bootstrapper
-from media.monitor.log import get_logger
+from media.monitor.log import get_logger, setup_logging
 from media.monitor.config import MMConfig
 from media.monitor.toucher import ToucherThread
 from media.monitor.syncdb import AirtimeDB
@@ -16,8 +16,11 @@ import media.monitor.pure as mmp
 
 from api_clients import api_client as apc
 
-log = get_logger()
 global_config = u'/home/rudi/Airtime/python_apps/media-monitor2/tests/live_client.cfg'
+logfile = u'/home/rudi/throwaway/mm2.log'
+
+setup_logging(logfile)
+log = get_logger()
 # MMConfig is a proxy around ConfigObj instances. it does not allow itself
 # users of MMConfig instances to modify any config options directly through the
 # dictionary. Users of this object muse use the correct methods designated for