PolarisPyra/artemis
1
0
Fork 0
forked from Hay1tsme/artemis
Code Pull Requests Activity

logger: change from warn to warning

Browse Source
This commit is contained in:
Hay1tsme
2023-08-08 10:17:56 -04:00
parent 2e277e7791
commit 88a1462304
42 changed files with 168 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/allnet.py
View File

@ -109,7 +109,7 @@ class AllnetServlet:
self.data.base.log_event(
"allnet", "ALLNET_AUTH_UNKNOWN_GAME", logging.WARN, msg
)
self.logger.warn(msg)
self.logger.warning(msg)
resp.stat = -1
resp_dict = {k: v for k, v in vars(resp).items() if v is not None}
@ -136,7 +136,7 @@ class AllnetServlet:
self.data.base.log_event(
"allnet", "ALLNET_AUTH_UNKNOWN_SERIAL", logging.WARN, msg
)
self.logger.warn(msg)
self.logger.warning(msg)
resp.stat = -2
resp_dict = {k: v for k, v in vars(resp).items() if v is not None}
@ -259,7 +259,7 @@ class AllnetServlet:
try:
req_dict: Dict = json.loads(req_raw)
except Exception as e:
self.logger.warn(f"Failed to parse DL Report: {e}")
self.logger.warning(f"Failed to parse DL Report: {e}")
return "NG"
dl_data_type = DLIMG_TYPE.app
@ -270,13 +270,13 @@ class AllnetServlet:
dl_data = req_dict.get("optimage", {})
if dl_data is None or not dl_data:
self.logger.warn(f"Failed to parse DL Report: Invalid format - contains neither appimage nor optimage")
self.logger.warning(f"Failed to parse DL Report: Invalid format - contains neither appimage nor optimage")
return "NG"
dl_report_data = DLReport(dl_data, dl_data_type)
if not dl_report_data.validate():
self.logger.warn(f"Failed to parse DL Report: Invalid format - {dl_report_data.err}")
self.logger.warning(f"Failed to parse DL Report: Invalid format - {dl_report_data.err}")
return "NG"
return "OK"
@ -334,7 +334,7 @@ class AllnetServlet:
self.data.base.log_event(
"allnet", "BILLING_CHECKIN_NG_SERIAL", logging.WARN, msg
)
self.logger.warn(msg)
self.logger.warning(msg)
resp = BillingResponse("", "", "", "")
resp.result = "1"

12
core/data/database.py
View File

@ -15,7 +15,7 @@ from core.utils import Utils
class Data:
current_schema_version = 5
current_schema_version = 6
engine = None
session = None
user = None
@ -163,7 +163,7 @@ class Data:
version = mod.current_schema_version
else:
self.logger.warn(
self.logger.warning(
f"current_schema_version not found for {folder}"
)
@ -171,7 +171,7 @@ class Data:
version = self.current_schema_version
if version is None:
self.logger.warn(
self.logger.warning(
f"Could not determine latest version for {game}, please specify --version"
)
@ -254,7 +254,7 @@ class Data:
self.logger.error(f"Failed to create card for owner with id {user_id}")
return
self.logger.warn(
self.logger.warning(
f"Successfully created owner with email {email}, access code 00000000000000000000, and password {pw} Make sure to change this password and assign a real card ASAP!"
)
@ -269,7 +269,7 @@ class Data:
return
if not should_force:
self.logger.warn(
self.logger.warning(
f"Card already exists for access code {new_ac} (id {new_card['id']}). If you wish to continue, rerun with the '--force' flag."
f" All exiting data on the target card {new_ac} will be perminently erased and replaced with data from card {old_ac}."
)
@ -307,7 +307,7 @@ class Data:
def autoupgrade(self) -> None:
all_game_versions = self.base.get_all_schema_vers()
if all_game_versions is None:
self.logger.warn("Failed to get schema versions")
self.logger.warning("Failed to get schema versions")
return
all_games = Utils.get_all_titles()

1
core/data/schema/arcade.py
View File

@ -22,6 +22,7 @@ arcade = Table(
Column("city", String(255)),
Column("region_id", Integer),
Column("timezone", String(255)),
Column("ip", String(39)),
mysql_charset="utf8mb4",
)

2
core/frontend.py
View File

@ -231,7 +231,7 @@ class FE_Gate(FE_Base):
user = self.data.user.get_user(card['user'])
if user is None:
self.logger.warn(f"Card {ac} exists with no/invalid associated user ID {card['user']}")
self.logger.warning(f"Card {ac} exists with no/invalid associated user ID {card['user']}")
return redirectTo(b"/gate?e=0", request)
if user['password'] is not None:

4
core/mucha.py
View File

@ -64,7 +64,7 @@ class MuchaServlet:
self.logger.debug(f"Mucha request {vars(req)}")
if req.gameCd not in self.mucha_registry:
self.logger.warn(f"Unknown gameCd {req.gameCd}")
self.logger.warning(f"Unknown gameCd {req.gameCd}")
return b"RESULTS=000"
# TODO: Decrypt S/N
@ -99,7 +99,7 @@ class MuchaServlet:
self.logger.debug(f"Mucha request {vars(req)}")
if req.gameCd not in self.mucha_registry:
self.logger.warn(f"Unknown gameCd {req.gameCd}")
self.logger.warning(f"Unknown gameCd {req.gameCd}")
return b"RESULTS=000"
resp = MuchaUpdateResponse(req.gameVer, f"{self.config.mucha.hostname}{':' + str(self.config.allnet.port) if self.config.server.is_develop else ''}")

10
core/title.py
View File

@ -62,7 +62,7 @@ class TitleServlet:
self.title_registry[code] = handler_cls
else:
self.logger.warn(f"Game {folder} has no get_allnet_info")
self.logger.warning(f"Game {folder} has no get_allnet_info")
else:
self.logger.error(f"{folder} missing game_code or index in __init__.py")
@ -74,13 +74,13 @@ class TitleServlet:
def render_GET(self, request: Request, endpoints: dict) -> bytes:
code = endpoints["game"]
if code not in self.title_registry:
self.logger.warn(f"Unknown game code {code}")
self.logger.warning(f"Unknown game code {code}")
request.setResponseCode(404)
return b""
index = self.title_registry[code]
if not hasattr(index, "render_GET"):
self.logger.warn(f"{code} does not dispatch GET")
self.logger.warning(f"{code} does not dispatch GET")
request.setResponseCode(405)
return b""
@ -89,13 +89,13 @@ class TitleServlet:
def render_POST(self, request: Request, endpoints: dict) -> bytes:
code = endpoints["game"]
if code not in self.title_registry:
self.logger.warn(f"Unknown game code {code}")
self.logger.warning(f"Unknown game code {code}")
request.setResponseCode(404)
return b""
index = self.title_registry[code]
if not hasattr(index, "render_POST"):
self.logger.warn(f"{code} does not dispatch POST")
self.logger.warning(f"{code} does not dispatch POST")
request.setResponseCode(405)
return b""