ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-17 17:42:20 +03:00
Code Issues Projects Releases Wiki Activity

Added per-event killswitch

Browse Source
This commit is contained in:
A_D 2020-11-03 18:02:39 +02:00 committed by Athanasius
parent 81e2cd2f92
commit b694bdc965
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/eddn.py
View File

@ -613,10 +613,10 @@ def journal_entry( # noqa: C901
if (ks := killswitch.get_disabled("plugins.eddn.journal")).disabled:
logger.warning(f"EDDN journal handler has been disabled via killswitch: {ks.reason}")
plug.show_error("EDDN journal handler disabled. See Log.")
return
elif (ks := killswitch.get_disabled(f'plugins.eddn.journal.event{entry["name"]}')).disabled:
logger.warning(f'Handling of event {entry["name"]} disabled via killswitch: {ks.reason}')
return
return None
elif (ks := killswitch.get_disabled(f'plugins.eddn.journal.event{entry["event"]}')).disabled:
logger.warning(f'Handling of event {entry["event"]} disabled via killswitch: {ks.reason}')
return None
# Recursively filter '*_Localised' keys from dict
def filter_localised(d: Mapping[str, Any]) -> OrderedDictT[str, Any]:

4
plugins/edsm.py
View File

@ -343,8 +343,8 @@ def journal_entry(
logger.warning(f'EDSM Journal handler disabled via killswitch: {ks.reason}')
plug.show_error('EDSM Handler disabled. See Log.')
return
elif (ks := killswitch.get_disabled(f'plugins.edsm.journal.event.{entry["name"]}')).disabled:
logger.warning(f'Handling of event {entry["name"]} has been disabled via killswitch: {ks.reason}')
elif (ks := killswitch.get_disabled(f'plugins.edsm.journal.event.{entry["event"]}')).disabled:
logger.warning(f'Handling of event {entry["event"]} has been disabled via killswitch: {ks.reason}')
return
if entry['event'] in ('CarrierJump', 'FSDJump', 'Location', 'Docked'):

3
plugins/inara.py
View File

@ -326,7 +326,8 @@ def journal_entry(
logger.warning(f'INARA support has been disabled via killswitch: {ks.reason}')
plug.show_error('INARA disabled. See Log.')
return
elif (ks := killswitch.get_disabled(f''))
elif (ks := killswitch.get_disabled(f'plugins.inara.journal.event.{entry["event"]}')).disabled:
logger.warning(f'event {entry["event"]} processing has been disabled via killswitch: {ks.reason}')
event_name: str = entry['event']
this.cmdr = cmdr