From 6740436975bb8a46b59f52795ff83953bb5df938 Mon Sep 17 00:00:00 2001 From: tal66 <77445020+tal66@users.noreply.github.com> Date: Wed, 27 Apr 2022 22:50:03 +0300 Subject: [PATCH 1/2] Find unused port for codechecker server --- web/server/codechecker_server/cmd/server.py | 41 +++++++++++++-------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/web/server/codechecker_server/cmd/server.py b/web/server/codechecker_server/cmd/server.py index f985fed0c3..defa1e7dd3 100644 --- a/web/server/codechecker_server/cmd/server.py +++ b/web/server/codechecker_server/cmd/server.py @@ -43,6 +43,7 @@ host_check, env LOG = logger.get_logger('server') +DEFAULT_SERVER_PORT = 8001 def get_argparser_ctor_args(): @@ -113,7 +114,7 @@ def add_arguments_to_parser(parser): type=int, dest="view_port", metavar='PORT', - default=8001, + default=DEFAULT_SERVER_PORT, required=False, help="The port which will be used as listen port for " "the server.") @@ -954,21 +955,31 @@ def server_init_start(args): 'version': context.package_git_tag} try: - server.start_server(args.config_directory, - package_data, - args.view_port, - cfg_sql_server, - args.listen_address, - 'force_auth' in args, - args.skip_db_cleanup, - context, - environ) + server_args = { + 'config_directory': args.config_directory, + 'package_data': package_data, + 'port': args.view_port, + 'config_sql_server': cfg_sql_server, + 'listen_address': args.listen_address, + 'force_auth': 'force_auth' in args, + 'skip_db_cleanup': args.skip_db_cleanup, + 'context': context, + 'check_env': environ + } + server.start_server(**server_args) except socket.error as err: - if err.errno == errno.EADDRINUSE: - LOG.error("Server can't be started, maybe the given port number " - "(%s) is already used. Check the connection " - "parameters.", args.view_port) - sys.exit(1) + # let os find a port, unless user requested specific port in args + if ( + err.errno == errno.EADDRINUSE + and args.view_port == DEFAULT_SERVER_PORT + ): + LOG.info( + "Port %s is already used, trying another port.", + server_args['port'] + ) + + server_args['port'] = 0 + server.start_server(**server_args) else: raise From 298666232076233649570e6476d580f42bc5f859 Mon Sep 17 00:00:00 2001 From: tal66 <77445020+tal66@users.noreply.github.com> Date: Thu, 28 Apr 2022 13:16:53 +0300 Subject: [PATCH 2/2] Find unused port for codechecker server - message --- web/server/codechecker_server/cmd/server.py | 42 ++++++++------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/web/server/codechecker_server/cmd/server.py b/web/server/codechecker_server/cmd/server.py index defa1e7dd3..b9a40f8556 100644 --- a/web/server/codechecker_server/cmd/server.py +++ b/web/server/codechecker_server/cmd/server.py @@ -43,7 +43,6 @@ host_check, env LOG = logger.get_logger('server') -DEFAULT_SERVER_PORT = 8001 def get_argparser_ctor_args(): @@ -114,7 +113,7 @@ def add_arguments_to_parser(parser): type=int, dest="view_port", metavar='PORT', - default=DEFAULT_SERVER_PORT, + default=8001, required=False, help="The port which will be used as listen port for " "the server.") @@ -955,31 +954,22 @@ def server_init_start(args): 'version': context.package_git_tag} try: - server_args = { - 'config_directory': args.config_directory, - 'package_data': package_data, - 'port': args.view_port, - 'config_sql_server': cfg_sql_server, - 'listen_address': args.listen_address, - 'force_auth': 'force_auth' in args, - 'skip_db_cleanup': args.skip_db_cleanup, - 'context': context, - 'check_env': environ - } - server.start_server(**server_args) + server.start_server(args.config_directory, + package_data, + args.view_port, + cfg_sql_server, + args.listen_address, + 'force_auth' in args, + args.skip_db_cleanup, + context, + environ) except socket.error as err: - # let os find a port, unless user requested specific port in args - if ( - err.errno == errno.EADDRINUSE - and args.view_port == DEFAULT_SERVER_PORT - ): - LOG.info( - "Port %s is already used, trying another port.", - server_args['port'] - ) - - server_args['port'] = 0 - server.start_server(**server_args) + if err.errno == errno.EADDRINUSE: + LOG.error("Server can't be started, maybe port number (%s) is " + "already used. Check the connection parameters. Use " + "the option '-p 0' to find a free port automatically.", + args.view_port) + sys.exit(1) else: raise