Skip to content

Commit

Permalink
Enable system certificate store later in the code and bump version to…
Browse files Browse the repository at this point in the history
… 2.2.42.dev4
  • Loading branch information
grossmj committed Aug 8, 2023
1 parent 21d9d96 commit fad28c7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions gns3server/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,16 @@
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
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():
"""
Expand Down Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion gns3server/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__:
Expand Down

0 comments on commit fad28c7

Please sign in to comment.