diff --git a/requirements.in b/requirements.in index 8254995..7520d92 100644 --- a/requirements.in +++ b/requirements.in @@ -1,4 +1,3 @@ jsonschema -python-dotenv wslink websocket-client \ No newline at end of file diff --git a/src/opengeodeweb_viewer/config.py b/src/opengeodeweb_viewer/config.py index 1892b88..7e0d38d 100644 --- a/src/opengeodeweb_viewer/config.py +++ b/src/opengeodeweb_viewer/config.py @@ -3,7 +3,7 @@ def default_config(): - os.environ["HOST"] = "0.0.0.0" + os.environ["DEFAULT_HOST"] = "localhost" os.environ["DEFAULT_PORT"] = "1234" diff --git a/src/opengeodeweb_viewer/vtkw_server.py b/src/opengeodeweb_viewer/vtkw_server.py index a4de26e..191b523 100644 --- a/src/opengeodeweb_viewer/vtkw_server.py +++ b/src/opengeodeweb_viewer/vtkw_server.py @@ -81,10 +81,6 @@ def initialize(self): def run_server(): - basedir = os.path.abspath(os.path.dirname(__file__)) - dot_env_path = os.path.join(basedir, "../../.env") - if os.path.isfile(dot_env_path): - dotenv.load_dotenv(dot_env_path) PYTHON_ENV = os.environ.get("PYTHON_ENV", default="prod").strip().lower() if PYTHON_ENV == "prod": prod_config() @@ -96,11 +92,14 @@ def run_server(): _Server.add_arguments(parser) args = parser.parse_args() + + if "host" in args: + args.host = os.environ["DEFAULT_HOST"] if not "port" in args or args.port == 8080: args.port = os.environ.get("DEFAULT_PORT") if "data_folder_path" in args: os.environ["DATA_FOLDER_PATH"] = args.data_folder_path - args.host = os.environ.get("HOST") + print(f"{args=}", flush=True) _Server.configure(args) server.start_webserver(options=args, protocol=_Server)