sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-11 00:45:09 +08:00
Code Activity

Opt: Show exceptions on server update failures

Browse Source
This commit is contained in:
LmeSzinc
2022-12-28 17:04:49 +08:00
parent 6e0f53bd6d
commit 39c4043593
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/server_checker.py
View File

@@ -75,8 +75,9 @@ class ServerChecker:
raise ScriptError(f'Server "{self._server}" does not exist!') raise ScriptError(f'Server "{self._server}" does not exist!')
else: else:
raise ScriptError(f'Get status_code {resp.status_code}. Response is {resp.text}') raise ScriptError(f'Get status_code {resp.status_code}. Response is {resp.text}')
except (requests.exceptions.ConnectionError, requests.exceptions.ConnectTimeout): except (requests.exceptions.ConnectionError, requests.exceptions.ConnectTimeout) as e:
logger.warning('Timeout while connecting to server checker API.') logger.error(e)
logger.error('Timeout while connecting to server checker API.')
if self._retry: if self._retry:
self._state.append(False) self._state.append(False)
else: else:
@@ -85,6 +86,7 @@ class ServerChecker:
self._state.append(False) self._state.append(False)
raise ScriptError(f'Response "{resp.text}" seems not to be a JSON.') raise ScriptError(f'Response "{resp.text}" seems not to be a JSON.')
except Exception as e: except Exception as e:
logger.error(e)
self._state.append(False) self._state.append(False)
raise e raise e
@@ -173,6 +175,7 @@ class ServerChecker:
_ = requests.get('https://www.baidu.com', timeout=5) _ = requests.get('https://www.baidu.com', timeout=5)
network_available = True network_available = True
except Exception as e: except Exception as e:
logger.error(e)
network_available = False network_available = False
if network_available: if network_available:
@@ -186,11 +189,11 @@ class ServerChecker:
self._state.extend(last) self._state.extend(last)
return True return True
logger.warning('Cannot connect to API. Please check you network or disable server checker.') logger.error('Cannot connect to API. Please check you network or disable server checker.')
self._retry = False self._retry = False
self._state.extend(last) self._state.extend(last)
return False return False
else: else:
self._retry = False self._retry = False
logger.warning('Network is unavailable. Please check your network status.') logger.error('Network is unavailable. Please check your network status.')
return False return False