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

Merge branch '2.5.x-installer' into saas-installer-albert

Browse source 
Conflicts:
	python_apps/pypo/pypo/pypofile.py
This commit is contained in:
Albert Santoni 2015-05-22 18:26:16 -04:00
commit 6ca0e340a4
13 changed files with 42 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
View file

@ -1,4 +1,5 @@
import logging
import os
import sys
import time
import traceback
@ -28,7 +29,9 @@ def generate_liquidsoap_config(ss):
# ignore squashes unused variable errors from Liquidsoap
fh.write(("ignore(%s)\n" % key).encode('utf-8'))
auth_path = os.path.dirname(os.path.realpath(__file__))
fh.write('log_file = "/var/log/airtime/pypo-liquidsoap/<script>.log"\n')
fh.write('auth_path = "%s/liquidsoap_auth.py"\n' % auth_path)
fh.close()
def run():

6
python_apps/pypo/liquidsoap/ls_script.liq
View file

@ -3,7 +3,7 @@
set("log.file.path", log_file)
set("server.telnet", true)
set("server.telnet.port", 1234)
set("init.daemon.pidfile.path", "/var/run/airtime/airtime-liquidsoap.pid")
# set("init.daemon.pidfile.path", "/var/run/airtime/airtime-liquidsoap.pid")
%include "library/pervasives.liq"
@ -214,7 +214,7 @@ end
def check_master_dj_client(user,password) =
log("master connected")
#get the output of the php script
ret = get_process_lines("python /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_auth.py --master #{user} #{password}")
ret = get_process_lines("python #{auth_path} --master #{user} #{password}")
#ret has now the value of the live client (dj1,dj2, or djx), or "ERROR"/"unknown" ...
ret = list.hd(ret)
@ -225,7 +225,7 @@ end
def check_dj_client(user,password) =
log("live dj connected")
#get the output of the php script
ret = get_process_lines("python /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_auth.py --dj #{user} #{password}")
ret = get_process_lines("python #{auth_path} --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}")