ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-05-29 05:44:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable system certificate store later in the code and bump version to 2.2.42.dev4

Browse Source
This commit is contained in:
grossmj 2023-08-08 17:22:27 +10:00
parent 21d9d968c4
commit fad28c766a
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gns3server/run.py
View File

@ -28,16 +28,6 @@ import locale
import argparse import argparse
import psutil 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.web_server import WebServer
from gns3server.web.logger import init_logger from gns3server.web.logger import init_logger
@ -45,6 +35,9 @@ from gns3server.version import __version__
from gns3server.config import Config from gns3server.config import Config
from gns3server.crash_report import CrashReport from gns3server.crash_report import CrashReport
import logging
log = logging.getLogger(__name__)
def locale_check(): 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], 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())) 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) # check for the correct locale (UNIX/Linux only)
locale_check() locale_check()

2
gns3server/version.py
View File

@ -23,7 +23,7 @@
# or negative for a release candidate or beta (after the base version # or negative for a release candidate or beta (after the base version
# number has been incremented) # number has been incremented)
__version__ = "2.2.42.dev3" __version__ = "2.2.42.dev4"
__version_info__ = (2, 2, 42, 99) __version_info__ = (2, 2, 42, 99)
if "dev" in __version__: if "dev" in __version__: