eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allways add eRepublik commit id to bug reports and differentiate between callers and own commit ids

Browse Source
This commit is contained in:
Eriks K 2020-05-14 13:54:37 +03:00
parent c094ef26b4
commit 4cfe25b0b1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erepublik/__init__.py
View File

@ -5,7 +5,7 @@
__author__ = """Eriks Karls""" __author__ = """Eriks Karls"""
__email__ = 'eriks@72.lv' __email__ = 'eriks@72.lv'
__version__ = '0.20.0' __version__ = '0.20.0'
__commit_id__ = "3cac1cf" __commit_id__ = "c094ef2"
from erepublik import classes, utils from erepublik import classes, utils
from erepublik.citizen import Citizen from erepublik.citizen import Citizen

11
erepublik/utils.py
View File

@ -14,7 +14,7 @@ from typing import Any, List, Mapping, Optional, Union, Dict
import pytz import pytz
import requests import requests
from . import __commit_id__ from . import __commit_id__, __version__
try: try:
import simplejson as json import simplejson as json
@ -34,6 +34,7 @@ if not sys.version_info >= (3, 7):
FOOD_ENERGY: Dict[str, int] = dict(q1=2, q2=4, q3=6, q4=8, q5=10, q6=12, q7=20) FOOD_ENERGY: Dict[str, int] = dict(q1=2, q2=4, q3=6, q4=8, q5=10, q6=12, q7=20)
COMMIT_ID: str = __commit_id__ COMMIT_ID: str = __commit_id__
VERSION: str = __version__
erep_tz = pytz.timezone('US/Pacific') erep_tz = pytz.timezone('US/Pacific')
AIR_RANKS: Dict[int, str] = { AIR_RANKS: Dict[int, str] = {
@ -355,14 +356,14 @@ def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commi
:type exc_info: tuple :type exc_info: tuple
:param citizen: Citizen instance :param citizen: Citizen instance
:type citizen: Citizen :type citizen: Citizen
:param commit_id: Code's version by commit id :param commit_id: Caller's code version's commit id
:type commit_id: str :type commit_id: str
""" """
type_, value_, traceback_ = exc_info type_, value_, traceback_ = exc_info
content = [log_info] content = [log_info]
if not commit_id: content += [f"eRepublik version {VERSION}, commit id {COMMIT_ID}"]
commit_id = COMMIT_ID if commit_id:
content += ["Commit id: %s" % commit_id] content += [f"Commit id {commit_id}"]
content += [str(value_), str(type_), ''.join(traceback.format_tb(traceback_))] content += [str(value_), str(type_), ''.join(traceback.format_tb(traceback_))]
if interactive: if interactive: