From ad4b61e89f8e6f8e7ad09abeb228440be90e5ccf Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Tue, 16 Dec 2014 19:05:17 -0500 Subject: [PATCH] More work on monitless installer --- installer/install | 8 ++++++-- python_apps/api_clients/api_client.py | 1 + python_apps/pypo/airtime-liquidsoap-init-d | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/installer/install b/installer/install index 50026996f..f573c60ef 100755 --- a/installer/install +++ b/installer/install @@ -319,7 +319,7 @@ loud "\n-----------------------------------------------------" loud " * Installing Airtime Services * " loud "-----------------------------------------------------" -loudCmd "apt-get -y --force-yes install liquidsoap python python-virtaulenv" +loudCmd "apt-get -y --force-yes install liquidsoap python python-virtualenv" loudCmd "$AIRTIMEROOT/python_apps/python-virtualenv/virtualenv-install.sh" verbose "\n * Creating /usr/lib/airtime..." @@ -332,7 +332,11 @@ chmod 755 /run/airtime chown -R ${web_user}:${web_user} /run/airtime verbose "...Done" -verbose "\n * Installing API client..." +verbose "\n * Cpoying logging files..." +cp -R ${AIRTIMEROOT}/python_apps/std_err_override /usr/lib/airtime/std_err_override +verbose "...Done" + +verbose "\n * Cpoying API client files..." cp -R ${AIRTIMEROOT}/python_apps/api_clients /usr/lib/airtime/api_clients verbose "...Done" diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py index 6aaa0a7d0..8d35a11be 100644 --- a/python_apps/api_clients/api_client.py +++ b/python_apps/api_clients/api_client.py @@ -213,6 +213,7 @@ class AirtimeApiClient(object): try: self.config = ConfigObj(config_path) self.config.update(api_config) + self.logger.info(json.dumps(self.config)) self.services = RequestProvider(self.config) except Exception, e: self.logger.error('Error loading config file: %s', config_path) diff --git a/python_apps/pypo/airtime-liquidsoap-init-d b/python_apps/pypo/airtime-liquidsoap-init-d index 31144cc92..181dbcc83 100755 --- a/python_apps/pypo/airtime-liquidsoap-init-d +++ b/python_apps/pypo/airtime-liquidsoap-init-d @@ -31,7 +31,7 @@ start () { #start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \ #--pidfile $PIDFILE --nicelevel -15 --startas $DAEMON start-stop-daemon --start --quiet --chuid $USERID:$GROUPID \ - --nicelevel -15 --startas $DAEMON --exec $EXEC + --startas $DAEMON --exec $EXEC } stop () {