From 7e0db3b76c2f691e64a248083130f0c71cc96b1a Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 2 Jun 2011 17:37:12 -0400 Subject: [PATCH] cc-2055: switch to init.d -fix recorder not starting after upgrade --- install/airtime-upgrade.php | 9 +++++---- python_apps/show-recorder/airtime-show-recorder | 13 +++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index eca71d4da..a568fe9c5 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -90,11 +90,12 @@ $sql = "INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '1.9.0-de $CC_DBC->query($sql); -echo PHP_EOL."*** Updating Recorder ***".PHP_EOL; -system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py"); - echo PHP_EOL."*** Updating Pypo ***".PHP_EOL; -system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py"); +passthru("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py"); + +echo PHP_EOL."*** Updating Recorder ***".PHP_EOL; +passthru("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py"); + echo "******************************* Update Complete *******************************".PHP_EOL; diff --git a/python_apps/show-recorder/airtime-show-recorder b/python_apps/show-recorder/airtime-show-recorder index 9e10abed9..97124ff6f 100755 --- a/python_apps/show-recorder/airtime-show-recorder +++ b/python_apps/show-recorder/airtime-show-recorder @@ -1,7 +1,7 @@ #!/bin/sh + recorder_user="pypo" -export HOME="/var/tmp/airtime/show-recorder/" -export TERM=xterm + # Location of pypo_cli.py Python script recorder_path="/usr/lib/airtime/show-recorder/" @@ -10,17 +10,14 @@ recorder_script="recorder.py" api_client_path="/usr/lib/airtime/pypo/" cd ${recorder_path} -echo "*** Daemontools: starting daemon" exec 2>&1 -# Note the -u when calling python! we need it to get unbuffered binary stdout and stderr +export HOME="/var/tmp/airtime/show-recorder/" +export TERM=xterm export PYTHONPATH=${api_client_path} - #this line works: su ${recorder_user} -c "python -u ${recorder_path}${recorder_script}" +# Note the -u when calling python! we need it to get unbuffered binary stdout and stderr exec python -u ${recorder_path}${recorder_script} -#ecasound does not work when recorder script is called with setuidgid. -#setuidgid ${recorder_user} python -u ${recorder_path}${recorder_script} - # EOF