[~] Logger

This commit is contained in:
Maxim Khomutov 2024-01-19 20:17:15 +03:00
parent 0b1cc35e14
commit cf2e4a9cd7
2 changed files with 10 additions and 9 deletions

View File

@ -35,7 +35,7 @@ class Hosts:
except Exception as e:
self._hosts_meta[server]['rcon_ok'] = False
logger.error(f"[RCON] Сервер: {server}; Команда: {cmd}")
logger.error(e)
logger.exception(e)
return f"error: \"{e}\"", e
def mine(self, server: str = "default", update=False) -> tuple[JavaServer.lookup, Exception | None]:
@ -55,9 +55,8 @@ class Hosts:
return srv, None
except Exception as e:
self._hosts_meta[server]['mine_ok'] = False
logger.error(f"[MINE] Сервер не отвечает: {server} {s}")
logger.error(f"[MINE] Сервер не отвечает: {server}")
logger.exception(e)
self._hosts_meta["connected"] = False
return None, e
def parse_host(self, s: str | list, index: int = 1) -> tuple[str, str]:
@ -82,16 +81,16 @@ class Hosts:
self._hosts_meta['default'] = {}
# Test RCON
for name in self._hosts:
self.hosts.add(name)
server = self._hosts[name]
meta = self._hosts_meta[name] = server['meta']
# Test RCON
if meta['rcon'] > 0:
rcon = self._hosts_rcon[name] = server['rcon']
print(f"Проверка RCON {name}..", end="")
srv, e = self.rcon("list", name)
if srv:
if not e:
if meta['rcon'] == 1:
if self._hosts_rcon.get('default'):
logger.warning(f"[RCON] hosts.{name}.meta.rcon = 1 - Хотя уже есть дефолтный.")
@ -102,6 +101,7 @@ class Hosts:
if meta["important"]:
logger.error(f"[RCON] Важный хост не доступен: {name}")
enter_to_exit()
# Test MC
if meta["online"] > 0:
mine = self._hosts_mine[name] = server['mine']
print(f"Проверка MINE {name}..", end="")

View File

@ -181,10 +181,11 @@ def init_logger():
zipf.write(file, os.path.basename(file))
os.remove(file)
logger.remove(0)
logger.add(log_debug, level=0)
logger.add(log_file, format="{time:YYYY-MM-DD HH:mm:ss.SSS} | {level: <8} | {message}", level="INFO")
logger.add(sys.stdout, format="\r<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | "
"<level>{level: <8}</level> | {message}", level="INFO")
logger.add(log_debug, level=0, backtrace=True, diagnose=True)
logger.add(log_file, level="INFO", backtrace=False, diagnose=False,
format="{time:YYYY-MM-DD HH:mm:ss.SSS} | {level: <8} | {message}")
logger.add(sys.stdout, level="INFO", backtrace=False, diagnose=False,
format="\r<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{level: <8}</level> | {message}")
init_logger()