ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-01 16:11:18 +03:00
Code Issues Projects Releases Wiki Activity

monitor.py: Access trace_on via whole-config import

Browse Source 
This is necessary so as to see the same instance of config.trace_on as
is set up by EDMarketConnector.py.
This commit is contained in:
Athanasius 2021-08-11 12:33:22 +01:00
parent f6c0139440
commit 97808f5561
No known key found for this signature in database
GPG Key ID: AE3E527847057C7D
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
monitor.py
View File

@ -18,8 +18,9 @@ from typing import Tuple
if TYPE_CHECKING: if TYPE_CHECKING:
import tkinter import tkinter
import config as conf_module # Necessary to see the same config.trace_on as elsewhere
import util_ships import util_ships
from config import config, trace_on from config import config
from edmc_data import edmc_suit_shortnames, edmc_suit_symbol_localised from edmc_data import edmc_suit_shortnames, edmc_suit_symbol_localised
from EDMCLogging import get_main_logger from EDMCLogging import get_main_logger
@ -518,7 +519,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.live = True # First event in 3.0 self.live = True # First event in 3.0
self.cmdr = entry['Name'] self.cmdr = entry['Name']
self.state['FID'] = entry['FID'] self.state['FID'] = entry['FID']
if 'startup' in trace_on: if 'startup' in conf_module.trace_on:
logger.trace(f'"Commander" event, {monitor.cmdr=}, {monitor.state["FID"]=}') logger.trace(f'"Commander" event, {monitor.cmdr=}, {monitor.state["FID"]=}')
elif event_type == 'loadgame': elif event_type == 'loadgame':
@ -530,7 +531,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
self.cmdr = entry['Commander'] self.cmdr = entry['Commander']
# 'Open', 'Solo', 'Group', or None for CQC (and Training - but no LoadGame event) # 'Open', 'Solo', 'Group', or None for CQC (and Training - but no LoadGame event)
if not entry.get('Ship') and not entry.get('GameMode') or entry.get('GameMode', '').lower() == 'cqc': if not entry.get('Ship') and not entry.get('GameMode') or entry.get('GameMode', '').lower() == 'cqc':
if 'cqc-loadgame-events' in trace_on: if 'cqc-loadgame-events' in conf_module.trace_on:
logger.trace(f'loadgame to cqc: {entry}') logger.trace(f'loadgame to cqc: {entry}')
self.mode = 'CQC' self.mode = 'CQC'
@ -569,7 +570,7 @@ class EDLogs(FileSystemEventHandler): # type: ignore # See below
if entry.get('Ship') is not None and self._RE_SHIP_ONFOOT.search(entry['Ship']): if entry.get('Ship') is not None and self._RE_SHIP_ONFOOT.search(entry['Ship']):
self.state['OnFoot'] = True self.state['OnFoot'] = True
if 'startup' in trace_on: if 'startup' in conf_module.trace_on:
logger.trace(f'"LoadGame" event, {monitor.cmdr=}, {monitor.state["FID"]=}') logger.trace(f'"LoadGame" event, {monitor.cmdr=}, {monitor.state["FID"]=}')
elif event_type == 'newcommander': elif event_type == 'newcommander':