|
|
|
@ -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()
|
|
|
|
|
|
|
|
|
|