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 timeouts and improve single instance handling. Fixes #638 #693

Browse source
This commit is contained in:
clinton-hall 2015-01-30 13:17:18 +10:30
commit 8570a6bfc8
7 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nzbtomedia/__init__.py
View file

@ -18,7 +18,6 @@ APP_NAME = os.path.basename(APP_FILENAME)
LOG_DIR = os.path.join(PROGRAM_DIR, 'logs') LOG_DIR = os.path.join(PROGRAM_DIR, 'logs')
LOG_FILE = os.path.join(LOG_DIR, 'nzbtomedia.log') LOG_FILE = os.path.join(LOG_DIR, 'nzbtomedia.log')
PID_FILE = os.path.join(LOG_DIR, 'nzbtomedia.pid') PID_FILE = os.path.join(LOG_DIR, 'nzbtomedia.pid')
LOCK_SOCKET = None
CONFIG_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMedia.cfg') CONFIG_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMedia.cfg')
CONFIG_SPEC_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMedia.cfg.spec') CONFIG_SPEC_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMedia.cfg.spec')
CONFIG_MOVIE_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMovie.cfg') CONFIG_MOVIE_FILE = os.path.join(PROGRAM_DIR, 'autoProcessMovie.cfg')
@ -199,7 +198,7 @@ def initialize(section=None):
TRANSMISSIONHOST, TRANSMISSIONPORT, TRANSMISSIONPWD, TRANSMISSIONUSR, COMPRESSEDCONTAINER, MEDIACONTAINER, \ TRANSMISSIONHOST, TRANSMISSIONPORT, TRANSMISSIONPWD, TRANSMISSIONUSR, COMPRESSEDCONTAINER, MEDIACONTAINER, \
METACONTAINER, SECTIONS, ALL_FORKS, TEST_FILE, GENERALOPTS, LOG_GIT, GROUPS, SEVENZIP, CONCAT, VCRF, \ METACONTAINER, SECTIONS, ALL_FORKS, TEST_FILE, GENERALOPTS, LOG_GIT, GROUPS, SEVENZIP, CONCAT, VCRF, \
__INITIALIZED__, AUTO_UPDATE, APP_FILENAME, USER_DELAY, APP_NAME, TRANSCODE, DEFAULTS, GIT_PATH, GIT_USER, \ __INITIALIZED__, AUTO_UPDATE, APP_FILENAME, USER_DELAY, APP_NAME, TRANSCODE, DEFAULTS, GIT_PATH, GIT_USER, \
GIT_BRANCH, GIT_REPO, SYS_ENCODING, NZB_CLIENTAGENT, SABNZBDHOST, SABNZBDPORT, SABNZBDAPIKEY, LOCK_SOCKET, \ GIT_BRANCH, GIT_REPO, SYS_ENCODING, NZB_CLIENTAGENT, SABNZBDHOST, SABNZBDPORT, SABNZBDAPIKEY, \
DUPLICATE, IGNOREEXTENSIONS, VEXTENSION, OUTPUTVIDEOPATH, PROCESSOUTPUT, VCODEC, VCODEC_ALLOW, VPRESET, \ DUPLICATE, IGNOREEXTENSIONS, VEXTENSION, OUTPUTVIDEOPATH, PROCESSOUTPUT, VCODEC, VCODEC_ALLOW, VPRESET, \
VFRAMERATE, LOG_DB, VBITRATE, VRESOLUTION, ALANGUAGE, AINCLUDE, ACODEC, ACODEC_ALLOW, ABITRATE, \ VFRAMERATE, LOG_DB, VBITRATE, VRESOLUTION, ALANGUAGE, AINCLUDE, ACODEC, ACODEC_ALLOW, ABITRATE, \
ACODEC2, ACODEC2_ALLOW, ABITRATE2, ACODEC3, ACODEC3_ALLOW, ABITRATE3, ALLOWSUBS, SEXTRACT, SEMBED, SLANGUAGES, \ ACODEC2, ACODEC2_ALLOW, ABITRATE2, ACODEC3, ACODEC3_ALLOW, ABITRATE3, ALLOWSUBS, SEXTRACT, SEMBED, SLANGUAGES, \

2
nzbtomedia/autoProcess/autoProcessComics.py
View file

@ -58,7 +58,7 @@ class autoProcessComics:
logger.debug("Opening URL: %s" % (url), section) logger.debug("Opening URL: %s" % (url), section)
try: try:
r = requests.get(url, auth=(username, password), params=params, stream=True, verify=False) r = requests.get(url, auth=(username, password), params=params, stream=True, verify=False, timeout=(30, 300))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL", section) logger.error("Unable to open URL", section)
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ] return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ]

2
nzbtomedia/autoProcess/autoProcessGames.py
View file

@ -54,7 +54,7 @@ class autoProcessGames:
logger.debug("Opening URL: %s" % (url),section) logger.debug("Opening URL: %s" % (url),section)
try: try:
r = requests.get(url, params=params, verify=False) r = requests.get(url, params=params, verify=False, timeout=(30, 300))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL") logger.error("Unable to open URL")
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ] return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ]

8
nzbtomedia/autoProcess/autoProcessMovie.py
View file

@ -26,7 +26,7 @@ class autoProcessMovie:
logger.debug("Opening URL: %s with PARAMS: %s" % (url, params)) logger.debug("Opening URL: %s with PARAMS: %s" % (url, params))
try: try:
r = requests.get(url, params=params, verify=False) r = requests.get(url, params=params, verify=False, timeout=(30, 60))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL %s" % url) logger.error("Unable to open URL %s" % url)
return results return results
@ -234,7 +234,7 @@ class autoProcessMovie:
logger.postprocess("Starting %s scan for %s" % (method, inputName), section) logger.postprocess("Starting %s scan for %s" % (method, inputName), section)
try: try:
r = requests.get(url, params=params, verify=False) r = requests.get(url, params=params, verify=False, timeout=(30, 1800))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL", section) logger.error("Unable to open URL", section)
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ] return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ]
@ -275,7 +275,7 @@ class autoProcessMovie:
logger.debug("Opening URL: %s with PARAMS: %s" % (url, params), section) logger.debug("Opening URL: %s with PARAMS: %s" % (url, params), section)
try: try:
r = requests.get(url, params=params, verify=False) r = requests.get(url, params=params, verify=False, timeout=(30, 120))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL %s" % (url), section) logger.error("Unable to open URL %s" % (url), section)
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ] return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ]
@ -296,7 +296,7 @@ class autoProcessMovie:
logger.debug("Opening URL: %s" % (url), section) logger.debug("Opening URL: %s" % (url), section)
try: try:
r = requests.get(url, params={'media_id': media_id}, verify=False) r = requests.get(url, params={'media_id': media_id}, verify=False, timeout=(30, 600))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL %s" % (url), section) logger.error("Unable to open URL %s" % (url), section)
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ] return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ]

4
nzbtomedia/autoProcess/autoProcessMusic.py
View file

@ -18,7 +18,7 @@ class autoProcessMusic:
logger.debug("Opening URL: %s with PARAMS: %s" % (url, params)) logger.debug("Opening URL: %s with PARAMS: %s" % (url, params))
try: try:
r = requests.get(url, params=params, verify=False) r = requests.get(url, params=params, verify=False, timeout=(30, 120))
except Exception, e: except Exception, e:
logger.error("Unable to open URL") logger.error("Unable to open URL")
return None return None
@ -106,7 +106,7 @@ class autoProcessMusic:
logger.debug("Opening URL: %s with PARAMS: %s" % (url, params), section) logger.debug("Opening URL: %s with PARAMS: %s" % (url, params), section)
try: try:
r = requests.get(url, params=params, verify=False) r = requests.get(url, params=params, verify=False, timeout=(30, 300))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL %s" % (url) ,section) logger.error("Unable to open URL %s" % (url) ,section)
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ] return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ]

10
nzbtomedia/autoProcess/autoProcessTV.py
View file

@ -16,7 +16,7 @@ class autoProcessTV:
def command_complete(self, url, params, headers, section): def command_complete(self, url, params, headers, section):
r = None r = None
try: try:
r = requests.get(url, params=params, headers=headers, stream=True, verify=False) r = requests.get(url, params=params, headers=headers, stream=True, verify=False, timeout=(30, 60))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL: %s" % (url1), section) logger.error("Unable to open URL: %s" % (url1), section)
return None return None
@ -34,7 +34,7 @@ class autoProcessTV:
def CDH(self, url2, headers): def CDH(self, url2, headers):
r = None r = None
try: try:
r = requests.get(url2, params={}, headers=headers, stream=True, verify=False) r = requests.get(url2, params={}, headers=headers, stream=True, verify=False, timeout=(30, 60))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL: %s" % (url2), section) logger.error("Unable to open URL: %s" % (url2), section)
return False return False
@ -269,12 +269,12 @@ class autoProcessTV:
s = requests.Session() s = requests.Session()
login = "%s%s:%s%s/login" % (protocol,host,port,web_root) login = "%s%s:%s%s/login" % (protocol,host,port,web_root)
login_params = {'username': username, 'password': password} login_params = {'username': username, 'password': password}
s.post(login, data=login_params, stream=True, verify=False) s.post(login, data=login_params, stream=True, verify=False, timeout=(30, 60))
r = s.get(url, auth=(username, password), params=fork_params, stream=True, verify=False) r = s.get(url, auth=(username, password), params=fork_params, stream=True, verify=False, timeout=(30, 1800))
elif section == "NzbDrone": elif section == "NzbDrone":
logger.debug("Opening URL: %s with data: %s" % (url, str(data)), section) logger.debug("Opening URL: %s with data: %s" % (url, str(data)), section)
r = None r = None
r = requests.post(url, data=data, headers=headers, stream=True, verify=False) r = requests.post(url, data=data, headers=headers, stream=True, verify=False, timeout=(30, 1800))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL: %s" % (url), section) logger.error("Unable to open URL: %s" % (url), section)
return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ] return [1, "%s: Failed to post-process - Unable to connect to %s" % (section, section) ]

23
nzbtomedia/nzbToMediaUtil.py
View file

@ -32,7 +32,7 @@ def reportNzb(failure_link, clientAgent):
else: else:
return return
try: try:
r = requests.post(failure_link, headers=headers) r = requests.post(failure_link, headers=headers, timeout=(30, 300))
except Exception as e: except Exception as e:
logger.error("Unable to open URL %s due to %s" % (failure_link, e)) logger.error("Unable to open URL %s due to %s" % (failure_link, e))
return return
@ -802,7 +802,7 @@ def find_download(clientAgent, download_id):
params['output'] = 'json' params['output'] = 'json'
params['value'] = download_id params['value'] = download_id
try: try:
r = requests.get(url, params=params, verify=False) r = requests.get(url, params=params, verify=False, timeout=(30, 120))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL") logger.error("Unable to open URL")
return False # failure return False # failure
@ -822,7 +822,7 @@ def get_nzoid(inputName):
params['mode'] = "queue" params['mode'] = "queue"
params['output'] = 'json' params['output'] = 'json'
try: try:
r = requests.get(url, params=params, verify=False) r = requests.get(url, params=params, verify=False, timeout=(30, 120))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL") logger.error("Unable to open URL")
return nzoid # failure return nzoid # failure
@ -964,7 +964,7 @@ def find_imdbid(dirName, inputName):
logger.debug("Opening URL: %s" % url) logger.debug("Opening URL: %s" % url)
try: try:
r = requests.get(url, params={'y': year, 't': title}, verify=False) r = requests.get(url, params={'y': year, 't': title}, verify=False, timeout=(60, 300))
except requests.ConnectionError: except requests.ConnectionError:
logger.error("Unable to open URL %s" % url) logger.error("Unable to open URL %s" % url)
return return
@ -1045,7 +1045,7 @@ def import_subs(filename):
def server_responding(baseURL): def server_responding(baseURL):
try: try:
requests.get(baseURL, timeout=60, verify=False) requests.get(baseURL, timeout=(30, 60), verify=False)
return True return True
except (requests.ConnectionError, requests.exceptions.Timeout): except (requests.ConnectionError, requests.exceptions.Timeout):
return False return False
@ -1141,15 +1141,18 @@ class PosixProcess():
def __init__(self): def __init__(self):
self.pidpath = nzbtomedia.PID_FILE self.pidpath = nzbtomedia.PID_FILE
self.lock_socket = None
def alreadyrunning(self): def alreadyrunning(self):
try: try:
nzbtomedia.LOCK_SOCKET = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) self.lock_socket = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
nzbtomedia.LOCK_SOCKET.bind('\0' + 'nzbtomedia') self.lock_socket.bind('\0' + self.pidpath)
return False self.lasterror = False
return self.lasterror
except socket.error as e: except socket.error as e:
if "Address already in use" in e: if "Address already in use" in e:
return True self.lasterror = True
return self.lasterror
except AttributeError: pass except AttributeError: pass
if os.path.exists(self.pidpath): if os.path.exists(self.pidpath):
# Make sure it is not a "stale" pidFile # Make sure it is not a "stale" pidFile
@ -1181,5 +1184,7 @@ class PosixProcess():
def __del__(self): def __del__(self):
if not self.lasterror: if not self.lasterror:
if self.lock_socket:
self.lock_socket.close()
if os.path.isfile(self.pidpath): if os.path.isfile(self.pidpath):
os.unlink(self.pidpath) os.unlink(self.pidpath)