prepare baby mm for saas

This commit is contained in:
Martin Konecny 2013-01-22 13:02:45 -05:00
parent 5d56341757
commit c6ee5bfe58
2 changed files with 9 additions and 9 deletions

View File

@ -2,7 +2,7 @@
import re import re
from media.saas.launcher import setup_logger, setup_global, MM2 from media.saas.launcher import setup_logger, setup_global, MM2
from media.saas.airtimeinstance import AirtimeInstance 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 from os import listdir
def list_dirs(d): return (x for x in listdir(d) if isdir(join(d,x))) 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) verify_exists(log_config)
log = setup_logger(log_config, log_path) log = setup_logger(log_config, log_path)
setup_global(log) setup_global(log)
for instance in autoscan_instances(main_cfg): for instance in autoscan_instances(main_cfg):
print("Launching instance: %s" % str(instance)) print("Launching instance: %s" % str(instance))
MM2(instance).start() #MM2(instance).start()
print("Launched all instances") print("Launched all instances")
if __name__ == '__main__': if __name__ == '__main__':
root = '/home/rudi/reps/Airtime/python_apps/media-monitor2' pwd = dirname(__file__)
default = { default = {
'log_path' : join(root, 'test.log'), # config for log 'log_path' : join(pwd, 'test.log'), # config for log
'log_config' : join(root, 'configs/logging.cfg'), # where to log 'log_config' : join(pwd, 'configs/logging.cfg'), # where to log
# root dir of all instances # root dir of all instances
'instance_root' : join(root, 'saas_stub') 'instance_root' : '/mnt/airtimepro/instances'
} }
main(default) main(default)

View File

@ -45,7 +45,7 @@ class AirtimeInstance(object):
touch_base_name = basename(touch_base_path) touch_base_name = basename(touch_base_path)
new_base_name = self.name + touch_base_name new_base_name = self.name + touch_base_name
return join(dirname(touch_base_path), new_base_name) return join(dirname(touch_base_path), new_base_name)
def __str__(self): def __str__(self):
return "%s,%s(%s)" % (self.name, self.root_path, self.config_paths) return "%s,%s(%s)" % (self.name, self.root_path, self.config_paths)