Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Initial work on monitless installation

Browse source
This commit is contained in:
Duncan Sommerville 2014-12-16 12:24:41 -05:00
parent ecb43c2587
commit 4dfd49d12c
23 changed files with 225 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python_apps/api_clients/api_client.py
View file

@ -83,6 +83,8 @@ api_config['push_stream_stats'] = 'push-stream-stats/api_key/%%api_key%%/format/
api_config['update_stream_setting_table'] = 'update-stream-setting-table/api_key/%%api_key%%/format/json'
api_config['get_files_without_silan_value'] = 'get-files-without-silan-value/api_key/%%api_key%%'
api_config['update_cue_values_by_silan'] = 'update-cue-values-by-silan/api_key/%%api_key%%'
api_config['api_base'] = 'api'
api_config['bin_dir'] = '/usr/lib/airtime/api_clients'
@ -203,7 +205,7 @@ class RequestProvider(object):
class AirtimeApiClient(object):
def __init__(self, logger=None,config_path='/etc/airtime/api_client.cfg'):
def __init__(self, logger=None,config_path='/etc/airtime/airtime.conf'):
if logger is None: self.logger = logging
else: self.logger = logger

4
python_apps/media-monitor/airtime-media-monitor-init-d
View file

@ -9,8 +9,8 @@
# Short-Description: Manage airtime-media-monitor daemon
### END INIT INFO
USERID=root
GROUPID=www-data
USERID=WEB_USER
GROUPID=WEB_USER
NAME=Airtime\ Media\ Monitor
DAEMON=/usr/lib/airtime/media-monitor/airtime-media-monitor

2
python_apps/media-monitor/airtimefilemonitor/mediaconfig.py
View file

@ -16,7 +16,7 @@ class AirtimeMediaConfig:
# loading config file
try:
config = ConfigObj('/etc/airtime/media-monitor.cfg')
config = ConfigObj('/etc/airtime/airtime.conf')
self.cfg = config
except Exception, e:
logger.info('Error loading config: ', e)

6
python_apps/media-monitor/install/media-monitor-copy-files.py
View file

@ -44,17 +44,13 @@ try:
# load config file
try:
config = ConfigObj(PATH_INI_FILE)
config['rabbitmq_user'] = os.environ['RABBITMQ_USER']
config['rabbitmq_password'] = os.environ['RABBITMQ_PASSWORD']
config['rabbitmq_vhost'] = os.environ['RABBITMQ_VHOST']
config.write()
except Exception, e:
print 'Error loading config file: ', e
sys.exit(1)
#copy monit files
shutil.copy('%s/../../monit/monit-airtime-generic.cfg'%current_script_dir, '/etc/monit/conf.d/')
subprocess.call('sed -i "s/\$admin_pass/%s/g" /etc/monit/conf.d/monit-airtime-generic.cfg' % get_rand_string(), shell=True)
subprocess.call('sed -i "s/\$admin_pass/%s/g" /etc/monit/conf.d/monit-airtime-generic.cfg' % get_rand_string(), shell=True, close_fds=True)
shutil.copy('%s/../monit-airtime-media-monitor.cfg'%current_script_dir, '/etc/monit/conf.d/')
#create log dir

5
python_apps/media-monitor/media_monitor.py
View file

@ -4,8 +4,7 @@ import sys
import mm2.mm2 as mm2
from std_err_override import LogWriter
global_cfg = '/etc/airtime/media-monitor.cfg'
api_client_cfg = '/etc/airtime/api_client.cfg'
global_cfg = '/etc/airtime/airtime.conf'
logging_cfg = '/usr/lib/airtime/media-monitor/logging.cfg'
mm2.main( global_cfg, api_client_cfg, logging_cfg )
mm2.main( global_cfg, logging_cfg )

4
python_apps/media-monitor2/media/saas/launcher.py
View file

@ -97,9 +97,9 @@ class MM2(InstanceThread, Loggable):
manager.loop()
def launch_instance(name, root, global_cfg, apc_cfg):
def launch_instance(name, root, global_cfg):
cfg = {
'api_client' : apc_cfg,
'api_client' : global_cfg,
'media_monitor' : global_cfg,
}
ai = AirtimeInstance(name, root, cfg)

4
python_apps/media-monitor2/mm2.py
View file

@ -4,12 +4,12 @@ import os
from media.saas.launcher import setup_global, launch_instance, setup_logger
from media.monitor.config import MMConfig
def main(global_config, api_client_config, log_config):
def main(global_config, log_config):
""" function to run hosted install """
mm_config = MMConfig(global_config)
log = setup_logger( log_config, mm_config['logpath'] )
setup_global(log)
launch_instance('hosted_install', '/', global_config, api_client_config)
launch_instance('hosted_install', '/', global_config)
__doc__ = """
Usage:

2
python_apps/media-monitor2/tests/prepare_tests.py
View file

@ -8,7 +8,7 @@ real_path1 = u'/home/rudi/throwaway/watch/unknown/unknown/ACDC_-_Back_In_Black-s
opath = u"/home/rudi/Airtime/python_apps/media-monitor2/tests/"
ppath = u"/home/rudi/Airtime/python_apps/media-monitor2/media/"
api_client_path = '/etc/airtime/api_client.cfg'
api_client_path = '/etc/airtime/airtime.conf'
# holdover from the time we had a special config for testing
sample_config = api_client_path
real_config = api_client_path

6
python_apps/pypo/install/pypo-copy-files.py
View file

@ -81,17 +81,13 @@ try:
# load config file
try:
config = ConfigObj(PATH_INI_FILE)
config['rabbitmq_user'] = os.environ['RABBITMQ_USER']
config['rabbitmq_password'] = os.environ['RABBITMQ_PASSWORD']
config['rabbitmq_vhost'] = os.environ['RABBITMQ_VHOST']
config.write()
except Exception, e:
print 'Error loading config file: ', e
sys.exit(1)
#copy monit files
shutil.copy('%s/../../monit/monit-airtime-generic.cfg'%current_script_dir, '/etc/monit/conf.d/')
subprocess.call('sed -i "s/\$admin_pass/%s/g" /etc/monit/conf.d/monit-airtime-generic.cfg' % get_rand_string(), shell=True)
subprocess.call('sed -i "s/\$admin_pass/%s/g" /etc/monit/conf.d/monit-airtime-generic.cfg' % get_rand_string(), shell=True, close_fds=True)
monit_version = get_monit_version()
if version_compare(monit_version, "5.3.0") >= 0:

2
python_apps/pypo/liquidsoap_scripts/liquidsoap_prepare_terminate.py
View file

@ -14,6 +14,6 @@ try:
tn.read_all()
except Exception, e:
print('Error loading config file: %s', e)
print 'Error loading config file: %s' % e
sys.exit()