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

Merge branch '1.8.2' into devel

Browse source 
Conflicts:
	python_apps/pypo/airtime-liquidsoap
	python_apps/pypo/pypopush.py

-merged RC5/final 1.8.2 to devel
This commit is contained in:
martin 2011-06-13 10:51:09 -04:00
commit b6262438bd
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python_apps/pypo/pypopush.py
View file

@ -134,15 +134,16 @@ class PypoPush(Thread):
pass pass
#logger.debug('Empty schedule') #logger.debug('Empty schedule')
try:
if not currently_on_air and self.liquidsoap_state_play: if not currently_on_air and self.liquidsoap_state_play:
logger.debug('Notifying Liquidsoap to stop playback.') logger.debug('Notifying Liquidsoap to stop playback.')
try:
tn = telnetlib.Telnet(LS_HOST, LS_PORT) tn = telnetlib.Telnet(LS_HOST, LS_PORT)
tn.write('source.skip\n') tn.write('source.skip\n')
tn.write('exit\n') tn.write('exit\n')
tn.read_all() tn.read_all()
self.liquidsoap_state_play = False
except Exception, e: except Exception, e:
logger.debug(e)
self.liquidsoap_state_play = False self.liquidsoap_state_play = False
logger.debug('Could not connect to liquidsoap') logger.debug('Could not connect to liquidsoap')
@ -241,6 +242,5 @@ class PypoPush(Thread):
try: self.push('scheduler') try: self.push('scheduler')
except Exception, e: except Exception, e:
logger.error('Pypo Push Error, exiting: %s', e) logger.error('Pypo Push Error, exiting: %s', e)
sys.exit()
time.sleep(PUSH_INTERVAL) time.sleep(PUSH_INTERVAL)
loops += 1 loops += 1