Much shorter download timeouts

This should hopefully solve the stuck library sync
This commit is contained in:
tomkat83 2016-03-08 15:28:59 +01:00
parent 100421ce2d
commit e5e6f2208e
3 changed files with 8 additions and 2 deletions

View file

@ -37,7 +37,7 @@ class DownloadUtils():
# Requests session # Requests session
s = None s = None
timeout = 30 timeout = 3
def __init__(self): def __init__(self):

View file

@ -40,7 +40,7 @@ class image_cache_thread(threading.Thread):
"http://%s:%s/image/image://%s" "http://%s:%s/image/image://%s"
% (self.xbmc_host, self.xbmc_port, self.urlToProcess)), % (self.xbmc_host, self.xbmc_port, self.urlToProcess)),
auth=(self.xbmc_username, self.xbmc_password), auth=(self.xbmc_username, self.xbmc_password),
timeout=(35.1, 35.1)) timeout=(0.1, 0.1))
# We don't need the result # We don't need the result
except: pass except: pass

View file

@ -25,6 +25,7 @@ import PlexFunctions
############################################################################### ###############################################################################
@utils.logging
@utils.ThreadMethodsAdditionalStop('emby_shouldStop') @utils.ThreadMethodsAdditionalStop('emby_shouldStop')
@utils.ThreadMethods @utils.ThreadMethods
class ThreadedGetMetadata(Thread): class ThreadedGetMetadata(Thread):
@ -64,6 +65,10 @@ class ThreadedGetMetadata(Thread):
plexXML = PlexFunctions.GetPlexMetadata(updateItem['itemId']) plexXML = PlexFunctions.GetPlexMetadata(updateItem['itemId'])
if plexXML is None: if plexXML is None:
# Did not receive a valid XML - skip that item for now # Did not receive a valid XML - skip that item for now
self.logMsg("Could not get metadata for %s. "
"Skipping that item for now", -1)
with lock:
getMetadataCount += 1
queue.task_done() queue.task_done()
continue continue
@ -1105,6 +1110,7 @@ class LibrarySync(Thread):
self.run_internal() self.run_internal()
except Exception as e: except Exception as e:
utils.window('emby_dbScan', clear=True) utils.window('emby_dbScan', clear=True)
self.logMsg('LibrarySync thread crashed', -1)
# Library sync thread has crashed # Library sync thread has crashed
xbmcgui.Dialog().ok( xbmcgui.Dialog().ok(
heading=self.addonName, heading=self.addonName,