anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow disable script timeout

Browse Source
This commit is contained in:
JonnyWong16
2016-10-12 21:00:52 -07:00
parent fdc7078e5c
commit 86f84766c1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plexpy/notifiers.py
View File

@@ -2207,13 +2207,17 @@ class Scripts(object):
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
cwd=self.script_folder) cwd=self.script_folder)
if self.script_timeout:
timer = threading.Timer(self.script_timeout, kill_script, (process,)) timer = threading.Timer(self.script_timeout, kill_script, (process,))
else:
timer = None
try: try:
timer.start() if timer: timer.start()
output, error = process.communicate() output, error = process.communicate()
status = process.returncode status = process.returncode
finally: finally:
timer.cancel() if timer: timer.cancel()
except OSError as e: except OSError as e:
logger.error(u"PlexPy Notifiers :: Failed to run script: %s" % e) logger.error(u"PlexPy Notifiers :: Failed to run script: %s" % e)
@@ -2420,7 +2424,7 @@ class Scripts(object):
{'label': 'Script Timeout', {'label': 'Script Timeout',
'value': self.script_timeout, 'value': self.script_timeout,
'name': 'scripts_timeout', 'name': 'scripts_timeout',
'description': 'The number of seconds to wait before killing the script.', 'description': 'The number of seconds to wait before killing the script. 0 to disable timeout.',
'input_type': 'number' 'input_type': 'number'
} }
] ]