github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-20 13:23:18 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

add check for server_running with 60s timeout. Fixes #494

Browse source
This commit is contained in:
clinton-hall 2014-07-18 14:46:05 +09:30
commit b34e0aca32
7 changed files with 66 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

19
nzbtomedia/autoProcess/autoProcessComics.py
View file

@ -3,7 +3,7 @@ import time
import nzbtomedia
import requests
import time
from nzbtomedia.nzbToMediaUtil import convert_to_ascii, remoteDir
from nzbtomedia.nzbToMediaUtil import convert_to_ascii, remoteDir, server_responding
from nzbtomedia.nzbToMediaSceneExceptions import process_all_exceptions
from nzbtomedia import logger
@ -30,6 +30,16 @@ class autoProcessComics:
except:
remote_path = 0
if ssl:
protocol = "https://"
else:
protocol = "http://"
url = "%s%s:%s%s/post_process" % (protocol, host, port, web_root)
if not server_responding(url):
logger.error("Server did not respond. Exiting", section)
return [1, "%s: Failed to post-process - %s did not respond." % (section, section) ]
inputName, dirName = convert_to_ascii(inputName, dirName)
clean_name, ext = os.path.splitext(inputName)
if len(ext) == 4: # we assume this was a standrard extension.
@ -44,13 +54,6 @@ class autoProcessComics:
if inputName != None:
params['nzb_name'] = inputName
if ssl:
protocol = "https://"
else:
protocol = "http://"
url = "%s%s:%s%s/post_process" % (protocol, host, port, web_root)
success = False
logger.debug("Opening URL: %s" % (url), section)