From c6ee5bfe58c3705c74c55786f42830d19ee2151a Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 22 Jan 2013 13:02:45 -0500 Subject: [PATCH] prepare baby mm for saas --- python_apps/media-monitor2/baby.py | 16 ++++++++-------- .../media-monitor2/media/saas/airtimeinstance.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/python_apps/media-monitor2/baby.py b/python_apps/media-monitor2/baby.py index f9eb74d6f..c2e92afb7 100644 --- a/python_apps/media-monitor2/baby.py +++ b/python_apps/media-monitor2/baby.py @@ -2,7 +2,7 @@ import re from media.saas.launcher import setup_logger, setup_global, MM2 from media.saas.airtimeinstance import AirtimeInstance -from os.path import isdir, join, abspath, exists +from os.path import isdir, join, abspath, exists, dirname from os import listdir def list_dirs(d): return (x for x in listdir(d) if isdir(join(d,x))) @@ -32,17 +32,17 @@ def main(main_cfg): verify_exists(log_config) log = setup_logger(log_config, log_path) setup_global(log) - for instance in autoscan_instances(main_cfg): + for instance in autoscan_instances(main_cfg): print("Launching instance: %s" % str(instance)) - MM2(instance).start() + #MM2(instance).start() print("Launched all instances") -if __name__ == '__main__': - root = '/home/rudi/reps/Airtime/python_apps/media-monitor2' +if __name__ == '__main__': + pwd = dirname(__file__) default = { - 'log_path' : join(root, 'test.log'), # config for log - 'log_config' : join(root, 'configs/logging.cfg'), # where to log + 'log_path' : join(pwd, 'test.log'), # config for log + 'log_config' : join(pwd, 'configs/logging.cfg'), # where to log # root dir of all instances - 'instance_root' : join(root, 'saas_stub') + 'instance_root' : '/mnt/airtimepro/instances' } main(default) diff --git a/python_apps/media-monitor2/media/saas/airtimeinstance.py b/python_apps/media-monitor2/media/saas/airtimeinstance.py index 4c537d182..f8c9cd3d8 100644 --- a/python_apps/media-monitor2/media/saas/airtimeinstance.py +++ b/python_apps/media-monitor2/media/saas/airtimeinstance.py @@ -45,7 +45,7 @@ class AirtimeInstance(object): touch_base_name = basename(touch_base_path) new_base_name = self.name + touch_base_name return join(dirname(touch_base_path), new_base_name) - + def __str__(self): return "%s,%s(%s)" % (self.name, self.root_path, self.config_paths)