Merge branch '2.3.x'

This commit is contained in:
Martin Konecny 2013-04-08 18:55:54 -04:00
commit 5cb950e43f
5 changed files with 6 additions and 3 deletions

View file

@ -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

View file

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