Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

locks should occur inside try/catch

This commit is contained in:
Martin Konecny 2013-01-25 14:16:53 -05:00
parent a16e8d05aa
commit 8dd7ffee8c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python_apps/pypo/pypofetch.py
View File

@ -132,8 +132,8 @@ class PypoFetch(Thread):
elif(sourcename == "live_dj"): elif(sourcename == "live_dj"):
command += "live_dj_harbor.kick\n" command += "live_dj_harbor.kick\n"
lock.acquire()
try: try:
lock.acquire()
tn = telnetlib.Telnet(LS_HOST, LS_PORT) tn = telnetlib.Telnet(LS_HOST, LS_PORT)
tn.write(command) tn.write(command)
tn.write('exit\n') tn.write('exit\n')
@ -159,8 +159,9 @@ class PypoFetch(Thread):
else: else:
command += "stop\n" command += "stop\n"
lock.acquire()
try: try:
lock.acquire()
tn = telnetlib.Telnet(LS_HOST, LS_PORT) tn = telnetlib.Telnet(LS_HOST, LS_PORT)
tn.write(command) tn.write(command)
tn.write('exit\n') tn.write('exit\n')
@ -179,7 +180,6 @@ class PypoFetch(Thread):
info = self.api_client.get_bootstrap_info() info = self.api_client.get_bootstrap_info()
if info is None: if info is None:
self.logger.error('Unable to get bootstrap info.. Exiting pypo...') self.logger.error('Unable to get bootstrap info.. Exiting pypo...')
sys.exit(1)
else: else:
self.logger.debug('info:%s', info) self.logger.debug('info:%s', info)
for k, v in info['switch_status'].iteritems(): for k, v in info['switch_status'].iteritems():
@ -190,8 +190,8 @@ class PypoFetch(Thread):
def restart_liquidsoap(self): def restart_liquidsoap(self):
self.telnet_lock.acquire()
try: try:
self.telnet_lock.acquire()
self.logger.info("Restarting Liquidsoap") self.logger.info("Restarting Liquidsoap")
subprocess.call('/etc/init.d/airtime-liquidsoap restart', shell=True) subprocess.call('/etc/init.d/airtime-liquidsoap restart', shell=True)
@ -322,8 +322,8 @@ class PypoFetch(Thread):
This function updates the bootup time variable in Liquidsoap script This function updates the bootup time variable in Liquidsoap script
""" """
self.telnet_lock.acquire()
try: try:
self.telnet_lock.acquire()
tn = telnetlib.Telnet(LS_HOST, LS_PORT) tn = telnetlib.Telnet(LS_HOST, LS_PORT)
# update the boot up time of Liquidsoap. Since Liquidsoap is not restarting, # update the boot up time of Liquidsoap. Since Liquidsoap is not restarting,
# we are manually adjusting the bootup time variable so the status msg will get # we are manually adjusting the bootup time variable so the status msg will get
@ -395,8 +395,8 @@ class PypoFetch(Thread):
self.logger.info(LS_HOST) self.logger.info(LS_HOST)
self.logger.info(LS_PORT) self.logger.info(LS_PORT)
self.telnet_lock.acquire()
try: try:
self.telnet_lock.acquire()
tn = telnetlib.Telnet(LS_HOST, LS_PORT) tn = telnetlib.Telnet(LS_HOST, LS_PORT)
command = ('vars.station_name %s\n' % station_name).encode('utf-8') command = ('vars.station_name %s\n' % station_name).encode('utf-8')
self.logger.info(command) self.logger.info(command)