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

CC-3346: Recorder: Merge recorder with pypo

Browse source 
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
This commit is contained in:
James 2012-02-24 13:12:50 -05:00
parent 2ef6d230f9
commit 2f689ed583
30 changed files with 419 additions and 856 deletions
Download patch file Download diff file Expand all files Collapse all files

8
install_minimal/include/AirtimeIni.php
View file

@ -91,14 +91,6 @@ class AirtimeIni
exit(1);
}
if (!copy(__DIR__."/../../python_apps/show-recorder/recorder.cfg", AirtimeIni::CONF_FILE_RECORDER)){
echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
exit(1);
} else if (!self::ChangeFileOwnerGroupMod(AirtimeIni::CONF_FILE_RECORDER, self::CONF_PYPO_GRP)){
echo "Could not set ownership of recorder.cfg to 'pypo'. Exiting.";
exit(1);
}
if (!copy(__DIR__."/../../python_apps/pypo/liquidsoap_scripts/liquidsoap.cfg", AirtimeIni::CONF_FILE_LIQUIDSOAP)){
echo "Could not copy liquidsoap.cfg to /etc/airtime/. Exiting.";
exit(1);

5
install_minimal/include/AirtimeInstall.php
View file

@ -429,12 +429,9 @@ class AirtimeInstall
AirtimeIni::CONF_FILE_PYPO,
AirtimeIni::CONF_FILE_RECORDER,
"/usr/lib/airtime/pypo",
"/usr/lib/airtime/show-recorder",
"/var/log/airtime",
"/var/log/airtime/pypo",
"/var/log/airtime/show-recorder",
"/var/tmp/airtime/pypo",
"/var/tmp/airtime/show-recorder");
"/var/tmp/airtime/pypo");
foreach ($dirs as $f) {
if (file_exists($f)) {
echo "+ $f".PHP_EOL;

6
install_minimal/include/airtime-copy-files.sh
View file

@ -63,9 +63,9 @@ if [ "$python_service" -eq "0" ]; then
if [ "$pypo" = "t" ]; then
python $AIRTIMEROOT/python_apps/pypo/install/pypo-copy-files.py
fi
if [ "$showrecorder" = "t" ]; then
python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-copy-files.py
fi
#if [ "$showrecorder" = "t" ]; then
# python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-copy-files.py
#fi
fi
mkdir -p /usr/lib/airtime

12
install_minimal/include/airtime-initialize.sh
View file

@ -36,9 +36,9 @@ fi
if [ "$pypo" = "t" ]; then
python $AIRTIMEROOT/python_apps/pypo/install/pypo-initialize.py
fi
if [ "$showrecorder" = "t" ]; then
python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-initialize.py
fi
#if [ "$showrecorder" = "t" ]; then
# python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-initialize.py
#fi
# Start monit if it is not running, or restart if it is.
@ -61,9 +61,9 @@ if [ "$disable_auto_start_services" = "f" ]; then
monit monitor airtime-playout
monit monitor airtime-liquidsoap
fi
if [ "$showrecorder" = "t" ]; then
monit monitor airtime-show-recorder
fi
# if [ "$showrecorder" = "t" ]; then
# monit monitor airtime-show-recorder
# fi
fi
monit monitor rabbitmq-server

4
install_minimal/include/airtime-remove-files.sh
View file

@ -38,8 +38,8 @@ echo "* Pypo"
python $AIRTIMEROOT/python_apps/pypo/install/pypo-remove-files.py
echo "* Media-Monitor"
python $AIRTIMEROOT/python_apps/media-monitor/install/media-monitor-remove-files.py
echo "* Show-Recorder"
python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-remove-files.py
#echo "* Show-Recorder"
#python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-remove-files.py
#remove symlinks
rm -f /usr/bin/airtime-import

6
install_minimal/include/airtime-uninitialize.sh
View file

@ -19,8 +19,8 @@ set +e
monit unmonitor airtime-media-monitor >/dev/null 2>&1
monit unmonitor airtime-liquidsoap >/dev/null 2>&1
monit unmonitor airtime-playout >/dev/null 2>&1
monit unmonitor airtime-show-recorder >/dev/null 2>&1
#monit unmonitor rabbitmq-server
#monit unmonitor airtime-show-recorder >/dev/null 2>&1
monit unmonitor rabbitmq-server
set -e
#virtualenv_bin="/usr/lib/airtime/airtime_virtualenv/bin/"
@ -29,7 +29,7 @@ set -e
#uninitialize Airtime services
python $AIRTIMEROOT/python_apps/pypo/install/pypo-uninitialize.py
python $AIRTIMEROOT/python_apps/media-monitor/install/media-monitor-uninitialize.py
python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-uninitialize.py
#python $AIRTIMEROOT/python_apps/show-recorder/install/recorder-uninitialize.py
#call Airtime uninstall script
php --php-ini ${SCRIPTPATH}/../airtime-php.ini ${SCRIPTPATH}/airtime-uninstall.php