better logging

install_minimal/airtime-install

@@ -172,6 +172,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
 
@@ -208,6 +210,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

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
 

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();

python_apps/pypo/liquidsoap_scripts/ls_script.liq

@@ -192,6 +192,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
 

python_apps/pypo/pypofetch.py

@@ -142,7 +142,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()