diff --git a/gns3server/main.py b/gns3server/main.py index bba7cd3c..cd9689f3 100644 --- a/gns3server/main.py +++ b/gns3server/main.py @@ -85,6 +85,11 @@ def parse_arguments(): parser.add_argument("-d", "--debug", action="store_true", help="show debug logs and enable code live reload") args = parser.parse_args() + return args + + +def set_config(args): + config = Config.instance() server_config = config.get_section_config("Server") server_config["local"] = server_config.get("local", "true" if args.local else "false") @@ -97,26 +102,25 @@ def parse_arguments(): server_config["debug"] = server_config.get("debug", "true" if args.debug else "false") config.set_section_config("Server", server_config) - return args - def main(): """ Entry point for GNS3 server """ - # We init the logger with info level during config file parsing - user_log = init_logger(logging.INFO) - user_log.info("GNS3 server version {}".format(__version__)) - current_year = datetime.date.today().year - user_log.info("Copyright (c) 2007-{} GNS3 Technologies Inc.".format(current_year)) - level = logging.INFO args = parse_arguments() if args.debug: level = logging.DEBUG user_log = init_logger(level, quiet=args.quiet) + user_log = init_logger(logging.INFO) + user_log.info("GNS3 server version {}".format(__version__)) + current_year = datetime.date.today().year + user_log.info("Copyright (c) 2007-{} GNS3 Technologies Inc.".format(current_year)) + + set_config(args) + server_config = Config.instance().get_section_config("Server") if server_config.getboolean("local"): log.warning("Local mode is enabled. Beware, clients will have full control on your filesystem") diff --git a/gns3server/schemas/project.py b/gns3server/schemas/project.py index e0c2209a..8bb1f7de 100644 --- a/gns3server/schemas/project.py +++ b/gns3server/schemas/project.py @@ -28,7 +28,7 @@ PROJECT_CREATE_SCHEMA = { }, "uuid": { "description": "Project UUID", - "type": "string", + "type": ["string", "null"], "minLength": 36, "maxLength": 36, "pattern": "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"