cal/paper-dynasty-discord
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update logging format

Browse Source
This commit is contained in:
Cal Corum 2023-11-17 22:17:29 -06:00
parent 97c042c1f3
commit 695f680741
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
db_calls.py
View File

@ -97,10 +97,17 @@ def get_req_url(endpoint: str, api_ver: int = 2, object_id: int = None, params:
return req_url return req_url
def log_return_value(log_string: str):
if master_debug:
logging.info(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}\n')
else:
logging.debug(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}\n')
async def db_get(endpoint: str, api_ver: int = 2, object_id: int = None, params: list = None, none_okay: bool = True, async def db_get(endpoint: str, api_ver: int = 2, object_id: int = None, params: list = None, none_okay: bool = True,
timeout: int = 3): timeout: int = 3):
req_url = get_req_url(endpoint, api_ver=api_ver, object_id=object_id, params=params) req_url = get_req_url(endpoint, api_ver=api_ver, object_id=object_id, params=params)
log_string = f'get:\n{endpoint} id: {object_id} params: {params}' log_string = f'db_get - get: {endpoint} id: {object_id} params: {params}'
logging.info(log_string) if master_debug else logging.debug(log_string) logging.info(log_string) if master_debug else logging.debug(log_string)
retries = 0 retries = 0
@ -118,19 +125,11 @@ async def db_get(endpoint: str, api_ver: int = 2, object_id: int = None, params:
if resp.status_code == 200: if resp.status_code == 200:
data = resp.json() data = resp.json()
log_string = f'{data}' log_return_value(f'{data}')
if master_debug:
logging.info(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}')
else:
logging.debug(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}')
return data return data
elif none_okay: elif none_okay:
data = resp.json() data = resp.json()
log_string = f'{data}' log_return_value(f'{data}')
if master_debug:
logging.info(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}')
else:
logging.debug(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}')
return None return None
else: else:
logging.warning(resp.text) logging.warning(resp.text)
@ -139,7 +138,7 @@ async def db_get(endpoint: str, api_ver: int = 2, object_id: int = None, params:
async def db_patch(endpoint: str, object_id: int, params: list, api_ver: int = 2, timeout: int = 3): async def db_patch(endpoint: str, object_id: int, params: list, api_ver: int = 2, timeout: int = 3):
req_url = get_req_url(endpoint, api_ver=api_ver, object_id=object_id, params=params) req_url = get_req_url(endpoint, api_ver=api_ver, object_id=object_id, params=params)
log_string = f'patch:\n{endpoint} {params}' log_string = f'db_patch - patch: {endpoint} {params}'
logging.info(log_string) if master_debug else logging.debug(log_string) logging.info(log_string) if master_debug else logging.debug(log_string)
retries = 0 retries = 0
@ -157,11 +156,7 @@ async def db_patch(endpoint: str, object_id: int, params: list, api_ver: int = 2
if resp.status_code == 200: if resp.status_code == 200:
data = resp.json() data = resp.json()
log_string = f'{data}' log_return_value(f'{data}')
if master_debug:
logging.info(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}')
else:
logging.debug(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}')
return data return data
else: else:
logging.warning(resp.text) logging.warning(resp.text)
@ -170,7 +165,7 @@ async def db_patch(endpoint: str, object_id: int, params: list, api_ver: int = 2
async def db_post(endpoint: str, api_ver: int = 2, payload: dict = None, timeout: int = 3): async def db_post(endpoint: str, api_ver: int = 2, payload: dict = None, timeout: int = 3):
req_url = get_req_url(endpoint, api_ver=api_ver) req_url = get_req_url(endpoint, api_ver=api_ver)
log_string = f'post:\n{endpoint} payload: {payload}\ntype: {type(payload)}' log_string = f'db_post - post: {endpoint} payload: {payload}\ntype: {type(payload)}'
logging.info(log_string) if master_debug else logging.debug(log_string) logging.info(log_string) if master_debug else logging.debug(log_string)
retries = 0 retries = 0
@ -188,11 +183,7 @@ async def db_post(endpoint: str, api_ver: int = 2, payload: dict = None, timeout
if resp.status_code == 200: if resp.status_code == 200:
data = resp.json() data = resp.json()
log_string = f'{data}' log_return_value(f'{data}')
if master_debug:
logging.info(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}')
else:
logging.debug(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}')
return data return data
else: else:
logging.warning(resp.text) logging.warning(resp.text)
@ -201,7 +192,7 @@ async def db_post(endpoint: str, api_ver: int = 2, payload: dict = None, timeout
async def db_delete(endpoint: str, object_id: int, api_ver: int = 2, timeout=3): async def db_delete(endpoint: str, object_id: int, api_ver: int = 2, timeout=3):
req_url = get_req_url(endpoint, api_ver=api_ver, object_id=object_id) req_url = get_req_url(endpoint, api_ver=api_ver, object_id=object_id)
log_string = f'delete:\n{endpoint} {object_id}' log_string = f'db_delete - delete: {endpoint} {object_id}'
logging.info(log_string) if master_debug else logging.debug(log_string) logging.info(log_string) if master_debug else logging.debug(log_string)
retries = 0 retries = 0
@ -219,11 +210,7 @@ async def db_delete(endpoint: str, object_id: int, api_ver: int = 2, timeout=3):
if resp.status_code == 200: if resp.status_code == 200:
data = resp.json() data = resp.json()
log_string = f'{data}' log_return_value(f'{data}')
if master_debug:
logging.info(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}')
else:
logging.debug(f'return: {log_string[:1200]}{" [ S N I P P E D ]" if len(log_string) > 1200 else ""}')
return True return True
else: else:
logging.warning(resp.text) logging.warning(resp.text)