From a3b69fd94d23746adccc034570bc2ea8efdd6445 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Tue, 22 Sep 2020 16:20:05 +0100
Subject: [PATCH] Switch internal plugins to EDMCLogging.get_main_logger()

---
 plugins/eddn.py  | 6 +++---
 plugins/edsm.py  | 6 +++---
 plugins/inara.py | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/plugins/eddn.py b/plugins/eddn.py
index 2001d321..5e7f27fe 100644
--- a/plugins/eddn.py
+++ b/plugins/eddn.py
@@ -2,7 +2,6 @@
 
 import itertools
 import json
-import logging
 import pathlib
 import re
 import sys
@@ -19,7 +18,8 @@ import requests
 
 import myNotebook as nb  # noqa: N813
 from companion import category_map
-from config import applongname, appname, appversion, config
+from config import applongname, appversion, config
+from EDMCLogging import get_main_logger
 from myNotebook import Frame
 from prefs import prefsVersion
 from ttkHyperlinkLabel import HyperlinkLabel
@@ -32,7 +32,7 @@ if TYPE_CHECKING:
     def _(x: str) -> str:
         return x
 
-logger = logging.getLogger(appname)
+logger = get_main_logger()
 
 this: Any = sys.modules[__name__]  # For holding module globals
 
diff --git a/plugins/edsm.py b/plugins/edsm.py
index 2bc42b4c..b57575a3 100644
--- a/plugins/edsm.py
+++ b/plugins/edsm.py
@@ -10,7 +10,6 @@
 #    text is always fired.  i.e. CAPI cmdr_data() processing.
 
 import json
-import logging
 import sys
 import tkinter as tk
 from queue import Queue
@@ -21,14 +20,15 @@ import requests
 
 import myNotebook as nb  # noqa: N813
 import plug
-from config import applongname, appname, appversion, config
+from config import applongname, appversion, config
+from EDMCLogging import get_main_logger
 from ttkHyperlinkLabel import HyperlinkLabel
 
 if TYPE_CHECKING:
     def _(x: str) -> str:
         return x
 
-logger = logging.getLogger(appname)
+logger = get_main_logger()
 
 EDSM_POLL = 0.1
 _TIMEOUT = 20
diff --git a/plugins/inara.py b/plugins/inara.py
index e1b1efd8..4b61322c 100644
--- a/plugins/inara.py
+++ b/plugins/inara.py
@@ -2,7 +2,6 @@
 
 import dataclasses
 import json
-import logging
 import sys
 import time
 import tkinter as tk
@@ -22,10 +21,11 @@ import requests
 import myNotebook as nb  # noqa: N813
 import plug
 import timeout_session
-from config import applongname, appname, appversion, config
+from config import applongname, appversion, config
+from EDMCLogging import get_main_logger
 from ttkHyperlinkLabel import HyperlinkLabel
 
-logger = logging.getLogger(appname)
+logger = get_main_logger()
 
 if TYPE_CHECKING:
     def _(x: str) -> str:
@@ -1178,7 +1178,7 @@ def new_add_event(
 
     api_key = credentials(this.cmdr)
     if api_key is None:
-        logger.warn(f"cannot find an API key for cmdr {this.cmdr!r}")
+        logger.warning(f"cannot find an API key for cmdr {this.cmdr!r}")
         return
 
     key = Credentials(str(cmdr), str(fid), api_key)  # this fails type checking due to `this` weirdness, hence str()