From fad28c766a8a1454f80d69606917c0f8652bc056 Mon Sep 17 00:00:00 2001
From: grossmj <grossmj@gns3.net>
Date: Tue, 8 Aug 2023 17:22:27 +1000
Subject: [PATCH] Enable system certificate store later in the code and bump
 version to 2.2.42.dev4

---
 gns3server/run.py     | 20 ++++++++++----------
 gns3server/version.py |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gns3server/run.py b/gns3server/run.py
index 8f054e9f..672cc357 100644
--- a/gns3server/run.py
+++ b/gns3server/run.py
@@ -28,16 +28,6 @@ import locale
 import argparse
 import psutil
 
-import logging
-log = logging.getLogger(__name__)
-
-
-try:
-    import truststore
-    truststore.inject_into_ssl()
-    log.info("Using system certificate store for SSL connections")
-except ImportError:
-    pass
 
 from gns3server.web.web_server import WebServer
 from gns3server.web.logger import init_logger
@@ -45,6 +35,9 @@ from gns3server.version import __version__
 from gns3server.config import Config
 from gns3server.crash_report import CrashReport
 
+import logging
+log = logging.getLogger(__name__)
+
 
 def locale_check():
     """
@@ -249,6 +242,13 @@ def run():
     user_log.info("Running with Python {major}.{minor}.{micro} and has PID {pid}".format(major=sys.version_info[0], minor=sys.version_info[1],
                                                                                          micro=sys.version_info[2], pid=os.getpid()))
 
+    try:
+        import truststore
+        truststore.inject_into_ssl()
+        log.info("Using system certificate store for SSL connections")
+    except ImportError:
+        pass
+
     # check for the correct locale (UNIX/Linux only)
     locale_check()
 
diff --git a/gns3server/version.py b/gns3server/version.py
index 8dbe5ef9..51b5675f 100644
--- a/gns3server/version.py
+++ b/gns3server/version.py
@@ -23,7 +23,7 @@
 # or negative for a release candidate or beta (after the base version
 # number has been incremented)
 
-__version__ = "2.2.42.dev3"
+__version__ = "2.2.42.dev4"
 __version_info__ = (2, 2, 42, 99)
 
 if "dev" in __version__: