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

CC-4218: Live resource: Cannot connect live resource. 

- fixed
This commit is contained in:
James 2012-08-20 16:03:29 -04:00
parent 5315d1efd0
commit 1c9e290982
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python_apps/pypo/liquidsoap_scripts/liquidsoap_auth.py
View File

@ -13,6 +13,6 @@ if dj_type == '--master':
elif dj_type == '--dj': elif dj_type == '--dj':
source_type = 'dj' source_type = 'dj'
response = api_clients.check_live_stream_auth(username, password, type) response = api_clients.check_live_stream_auth(username, password, source_type)
print response['msg'] print response['msg']

9
python_apps/pypo/liquidsoap_scripts/ls_script.liq
View File

@ -160,19 +160,18 @@ end
#auth function for live stream #auth function for live stream
def check_master_dj_client(user,password) = def check_master_dj_client(user,password) =
log("master connected")
#get the output of the php script #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 /usr/lib/airtime/pypo/bin/liquidsoap_scripts/liquidsoap_auth.py --master #{user} #{password}")
#ret has now the value of the live client (dj1,dj2, or djx), or "ERROR"/"unknown" ... #ret has now the value of the live client (dj1,dj2, or djx), or "ERROR"/"unknown" ...
ret = list.hd(ret) ret = list.hd(ret)
#return true to let the client transmit data, or false to tell harbor to decline #return true to let the client transmit data, or false to tell harbor to decline
if (ret == "True") then ret == "True"
true
else
false
end
end end
def check_dj_client(user,password) = def check_dj_client(user,password) =
log("live dj connected")
#get the output of the php script #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 /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" ... #ret has now the value of the live client (dj1,dj2, or djx), or "ERROR"/"unknown" ...