Merge branch 'development' into python3

This commit is contained in:
Louis Vézina 2019-11-22 06:29:43 -05:00
commit 4016ed1d74

View file

@ -295,10 +295,11 @@ def request_json(url, **kwargs):
def updated(restart=True): def updated(restart=True):
if settings.general.getboolean('update_restart') and restart: if settings.general.getboolean('update_restart') and restart:
try: try:
from main import restart requests.get('http://127.0.0.1:' + settings.general.port + settings.general.base_url + 'restart')
restart() except requests.ConnectionError:
except: pass
logging.info('BAZARR Restart failed, please restart Bazarr manualy') except (requests.ConnectTimeout, requests.HTTPError, requests.ReadTimeout, requests.Timeout):
logging.info('BAZARR Restart failed, please restart Bazarr manually')
updated(restart=False) updated(restart=False)
else: else:
database.execute("UPDATE system SET updated='1'") database.execute("UPDATE system SET updated='1'")