moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-13 03:22:22 -05:00
Code Issues Releases Wiki Activity

Fix for webui becoming unresponsive when using SSL and possibly in other situations as well.

Browse Source
This commit is contained in:
echel0n 2014-07-23 23:36:44 -07:00
parent de5db9be64
commit e5ac585b6a
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SickBeard.py
View File

@ -332,8 +332,8 @@ class SickRage(object):
'password': sickbeard.WEB_PASSWORD, 'password': sickbeard.WEB_PASSWORD,
'enable_https': sickbeard.ENABLE_HTTPS, 'enable_https': sickbeard.ENABLE_HTTPS,
'handle_reverse_proxy': sickbeard.HANDLE_REVERSE_PROXY, 'handle_reverse_proxy': sickbeard.HANDLE_REVERSE_PROXY,
'https_cert': sickbeard.HTTPS_CERT, 'https_cert': os.path.join(sickbeard.PROG_DIR, sickbeard.HTTPS_CERT),
'https_key': sickbeard.HTTPS_KEY, 'https_key': os.path.join(sickbeard.PROG_DIR, sickbeard.HTTPS_KEY),
} }
# start web server # start web server

2
sickbeard/helpers.py
View File

@ -807,13 +807,11 @@ def create_https_certificates(ssl_cert, ssl_key):
return True return True
if __name__ == '__main__': if __name__ == '__main__':
import doctest import doctest
doctest.testmod() doctest.testmod()
def parse_json(data): def parse_json(data):
""" """
Parse json data into a python object Parse json data into a python object

8
sickbeard/metadata/generic.py
View File

@ -275,14 +275,15 @@ class GenericMetadata():
def update_show_indexer_metadata(self, show_obj): def update_show_indexer_metadata(self, show_obj):
if self.show_metadata and show_obj and self._has_show_metadata(show_obj): if self.show_metadata and show_obj and self._has_show_metadata(show_obj):
logger.log(u"Metadata provider " + self.name + " updating show indexer info metadata file for " + show_obj.name, logger.DEBUG) logger.log(
u"Metadata provider " + self.name + " updating show indexer info metadata file for " + show_obj.name,
logger.DEBUG)
nfo_file_path = self.get_show_file_path(show_obj) nfo_file_path = self.get_show_file_path(show_obj)
try: try:
with ek.ek(open, nfo_file_path, 'r') as xmlFileObj: with ek.ek(open, nfo_file_path, 'r') as xmlFileObj:
showXML = etree.ElementTree(file=xmlFileObj) showXML = etree.ElementTree(file=xmlFileObj)
indexer = showXML.find('indexer') indexer = showXML.find('indexer')
indexerid = showXML.find('id') indexerid = showXML.find('id')
@ -976,7 +977,8 @@ class GenericMetadata():
try: try:
search = tmdb.Search() search = tmdb.Search()
for show_name in set(allPossibleShowNames(show)): for show_name in set(allPossibleShowNames(show)):
for result in search.collection({'query': show_name})['results'] + search.tv({'query': show_name})['results']: for result in search.collection({'query': show_name})['results'] + search.tv({'query': show_name})[
'results']:
if backdrop and result['backdrop_path']: if backdrop and result['backdrop_path']:
return "{0}{1}{2}".format(base_url, max_size, result['backdrop_path']) return "{0}{1}{2}".format(base_url, max_size, result['backdrop_path'])
elif poster and result['poster_path']: elif poster and result['poster_path']:

5
sickbeard/webserveInit.py
View File

@ -123,11 +123,10 @@ class SRWebServer(threading.Thread):
def run(self): def run(self):
if self.enable_https: if self.enable_https:
protocol = "https" protocol = "https"
self.server = HTTPServer(self.app, no_keep_alive=True, self.server = HTTPServer(self.app, ssl_options={"certfile": self.https_cert, "keyfile": self.https_key})
ssl_options={"certfile": self.https_cert, "keyfile": self.https_key})
else: else:
protocol = "http" protocol = "http"
self.server = HTTPServer(self.app, no_keep_alive=True) self.server = HTTPServer(self.app)
logger.log(u"Starting SickRage on " + protocol + "://" + str(self.options['host']) + ":" + str( logger.log(u"Starting SickRage on " + protocol + "://" + str(self.options['host']) + ":" + str(
self.options['port']) + "/") self.options['port']) + "/")