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

CC-5986 - Fixed unit tests, removed unnecessary code from service execution files

Browse source
This commit is contained in:
Duncan Sommerville 2015-01-28 13:19:50 -05:00
parent 875a9dfd8b
commit bc604b992e
11 changed files with 424 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

12
python_apps/media-monitor/bin/airtime-media-monitor
View file

@ -1,15 +1,3 @@
#!/bin/bash
exec 2>&1
set +e
cat /etc/default/locale | grep -i "LANG=.*UTF-\?8"
set -e
if [ "$?" != "0" ]; then
echo "non UTF-8 default locale found in /etc/default/locale." > /var/log/airtime/media-monitor/error.log
exit 1
fi
export LC_ALL=`cat /etc/default/locale | grep "LANG=" | cut -d= -f2 | tr -d "\n\""`
exec python -m media_monitor > /var/log/airtime/media-monitor/py-interpreter.log 2>&1

11
python_apps/media-monitor/media_monitor/__main__.py
View file

@ -1,11 +1,16 @@
import logging
import locale
import time
import sys
import os
import mm2.mm2 as mm2
from std_err_override import LogWriter
locale.setlocale(locale.LC_ALL, '')
global_cfg = '/etc/airtime/airtime.conf'
logging_cfg = os.path.join(os.path.dirname(__file__), 'logging.cfg')
def run():
global_cfg = '/etc/airtime/airtime.conf'
logging_cfg = os.path.join(os.path.dirname(__file__), 'logging.cfg')
mm2.main( global_cfg, logging_cfg )
mm2.main( global_cfg, logging_cfg )
run()