Corrected a few things in autoFork to take in account we now use it dynamically for all autoProcessing scripts

This commit is contained in:
echel0n 2014-04-03 23:42:47 -07:00
commit 027c3e5a43

View file

@ -42,7 +42,7 @@ def autoFork(section):
detected = False detected = False
if fork == "auto": if fork == "auto":
Logger.info("Attempting to auto-detect SickBeard fork") Logger.info("Attempting to auto-detect " + section + " fork")
for fork in sorted(config.FORKS.iteritems()): for fork in sorted(config.FORKS.iteritems()):
url = protocol + host + ":" + port + web_root + "/home/postprocess/processEpisode?" + urllib.urlencode(fork[1]) url = protocol + host + ":" + port + web_root + "/home/postprocess/processEpisode?" + urllib.urlencode(fork[1])
@ -53,7 +53,7 @@ def autoFork(section):
else: else:
r = requests.get(url) r = requests.get(url)
except requests.ConnectionError: except requests.ConnectionError:
Logger.info("Could not connect to SickBeard to perform auto-fork detection!") Logger.info("Could not connect to " + section + " to perform auto-fork detection!")
break break
if r.ok: if r.ok:
@ -61,10 +61,10 @@ def autoFork(section):
break break
if detected: if detected:
Logger.info("SickBeard fork auto-detection successful ...") Logger.info("" + section + " fork auto-detection successful ...")
else: else:
Logger.info("SickBeard fork auto-detection failed") Logger.info("" + section + " fork auto-detection failed")
fork = config.FORKS.items()[config.FORKS.keys().index(config.FORK_DEFAULT)] fork = config.FORKS.items()[config.FORKS.keys().index(config.FORK_DEFAULT)]
Logger.info("SickBeard fork set to %s", fork[0]) Logger.info("" + section + " fork set to %s", fork[0])
return fork[0], fork[1] return fork[0], fork[1]