diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 647db6c8b..1440e3691 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -177,6 +177,8 @@ set -e echo -e "\n******************************** Install Begin *********************************" rm -rf "/usr/lib/airtime" +mkdir -p /usr/lib/airtime + if [ "$python_service" -eq "0" ]; then $AIRTIMEROOT/python_apps/python-virtualenv/virtualenv-install.sh @@ -213,6 +215,7 @@ if [ "$mediamonitor" = "t" -o "$pypo" = "t" ]; then fi +#An attempt to force apache to realize that files are updated on upgrade... touch /usr/share/airtime/public/index.php if [ "$python_service" -eq "0" ]; then diff --git a/install_minimal/include/airtime-copy-files.sh b/install_minimal/include/airtime-copy-files.sh index 20b128a68..ced1786de 100755 --- a/install_minimal/include/airtime-copy-files.sh +++ b/install_minimal/include/airtime-copy-files.sh @@ -72,7 +72,6 @@ if [ "$python_service" -eq "0" ]; then fi fi -mkdir -p /usr/lib/airtime cp -R $AIRTIMEROOT/utils /usr/lib/airtime cp -R $AIRTIMEROOT/python_apps/std_err_override /usr/lib/airtime diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php index bbd0c157a..ec7829269 100644 --- a/install_minimal/include/airtime-install.php +++ b/install_minimal/include/airtime-install.php @@ -13,7 +13,7 @@ require_once(__DIR__.'/airtime-constants.php'); // ------------------------------------------------------------------------- $iniExists = file_exists("/etc/airtime/airtime.conf"); -if ($iniExists){ +if ($iniExists) { //reinstall, Will ask if we should rewrite config files. require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php'); $CC_CONFIG = Config::getConfig(); diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq index 1add69009..9a52ace46 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq @@ -219,6 +219,7 @@ def check_dj_client(user,password) = ret = get_process_lines("python /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_auth.py --dj #{user} #{password}") #ret has now the value of the live client (dj1,dj2, or djx), or "ERROR"/"unknown" ... hd = list.hd(ret) + log("Live DJ authenticated: #{hd}") hd == "True" end diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py index 07ffcf2bf..82f404ce5 100644 --- a/python_apps/pypo/pypofetch.py +++ b/python_apps/pypo/pypofetch.py @@ -147,7 +147,7 @@ class PypoFetch(Thread): tn.write('exit\n') tn.read_all() except Exception, e: - logger.error(str(e)) + logger.error(traceback.format_exc()) finally: lock.release()