From 043fd4d8267a6e17d06db735b7099681525a8cda Mon Sep 17 00:00:00 2001
From: norohind <60548839+norohind@users.noreply.github.com>
Date: Thu, 12 Aug 2021 16:01:31 +0300
Subject: [PATCH 1/3] inara.py: put inara events trace logging under
 `inara-events` trace_on option

---
 plugins/inara.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/inara.py b/plugins/inara.py
index ea46f9ce..48515856 100644
--- a/plugins/inara.py
+++ b/plugins/inara.py
@@ -22,6 +22,7 @@ from companion import CAPIData
 from config import applongname, appversion, config, debug_senders
 from EDMCLogging import get_main_logger
 from ttkHyperlinkLabel import HyperlinkLabel
+import config as conf_module  # Necessary to see the same config.trace_on as elsewhere
 
 logger = get_main_logger()
 
@@ -1491,7 +1492,9 @@ def new_worker():
                 ]
             }
             logger.info(f'sending {len(data["events"])} events for {creds.cmdr}')
-            logger.trace(f'Events:\n{json.dumps(data)}\n')
+            if 'inara-events' in conf_module.trace_on:
+                logger.trace(f'Events:\n{json.dumps(data)}\n')
+
             try_send_data(TARGET_URL, data)
 
         time.sleep(WORKER_WAIT_TIME)

From e82abc8f03092c82b31ff055b83647865dd7cc66 Mon Sep 17 00:00:00 2001
From: norohind <60548839+norohind@users.noreply.github.com>
Date: Thu, 12 Aug 2021 19:36:27 +0300
Subject: [PATCH 2/3] inara.py: move `conf_module` import to satisfy isort

---
 plugins/inara.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/inara.py b/plugins/inara.py
index 48515856..024791c1 100644
--- a/plugins/inara.py
+++ b/plugins/inara.py
@@ -13,6 +13,7 @@ from typing import Sequence, Union, cast
 
 import requests
 
+import config as conf_module  # Necessary to see the same config.trace_on as elsewhere
 import edmc_data
 import killswitch
 import myNotebook as nb  # noqa: N813
@@ -22,7 +23,6 @@ from companion import CAPIData
 from config import applongname, appversion, config, debug_senders
 from EDMCLogging import get_main_logger
 from ttkHyperlinkLabel import HyperlinkLabel
-import config as conf_module  # Necessary to see the same config.trace_on as elsewhere
 
 logger = get_main_logger()
 

From a8a4abfe90e6245f333998229cb9bebdd1f8a986 Mon Sep 17 00:00:00 2001
From: norohind <60548839+norohind@users.noreply.github.com>
Date: Fri, 13 Aug 2021 18:06:38 +0300
Subject: [PATCH 3/3] inara.py: trace with `logger.trace_if` only

---
 plugins/inara.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/inara.py b/plugins/inara.py
index 024791c1..caa79644 100644
--- a/plugins/inara.py
+++ b/plugins/inara.py
@@ -13,7 +13,6 @@ from typing import Sequence, Union, cast
 
 import requests
 
-import config as conf_module  # Necessary to see the same config.trace_on as elsewhere
 import edmc_data
 import killswitch
 import myNotebook as nb  # noqa: N813
@@ -1492,8 +1491,7 @@ def new_worker():
                 ]
             }
             logger.info(f'sending {len(data["events"])} events for {creds.cmdr}')
-            if 'inara-events' in conf_module.trace_on:
-                logger.trace(f'Events:\n{json.dumps(data)}\n')
+            logger.trace_if('plugin.inara.events', f'Events:\n{json.dumps(data)}\n')
 
             try_send_data(TARGET_URL, data)