Skip to content

Commit 6f8bf75

Browse files
Merge pull request #22 from Geode-solutions/feat/dynamic_run_arguments
feat(vtkw_server): dynamic port and data_folder_path
2 parents 9d49a8f + d1e71a6 commit 6f8bf75

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/opengeodeweb_viewer/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
def default_config():
66
os.environ["HOST"] = "0.0.0.0"
7-
os.environ["PORT"] = "1234"
7+
os.environ["DEFAULT_PORT"] = "1234"
88

99

1010
def prod_config():

src/opengeodeweb_viewer/vtkw_server.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ class _Server(vtk_wslink.ServerProtocol):
2020
# Defaults
2121
authKey = "wslink-secret"
2222
view = None
23+
debug = False
2324

2425
@staticmethod
2526
def add_arguments(parser):
2627
parser.add_argument(
27-
"--virtual-env", default=None, help="Path to virtual environment to use"
28+
"--data_folder_path", default=os.environ.get("DATA_FOLDER_PATH"), help="Path to the folder where data is stored"
2829
)
2930

3031
@staticmethod
@@ -70,6 +71,7 @@ def initialize(self):
7071
widget.SetOrientationMarker(axes)
7172
widget.EnabledOn()
7273
widget.InteractiveOff()
74+
renderWindow.SetOffScreenRendering(not _Server.debug)
7375
self.setSharedObject("marker", widget)
7476

7577

@@ -94,10 +96,12 @@ def run_server():
9496

9597
_Server.add_arguments(parser)
9698
args = parser.parse_args()
97-
args.port = os.environ.get("PORT")
99+
if not "port" in args or args.port == 8080:
100+
args.port = os.environ.get("DEFAULT_PORT")
101+
if "data_folder_path" in args:
102+
os.environ["DATA_FOLDER_PATH"] = args.data_folder_path
98103
args.host = os.environ.get("HOST")
99104
print(f"{args=}", flush=True)
100-
101105
_Server.configure(args)
102106
server.start_webserver(options=args, protocol=_Server)
103107

0 commit comments

Comments
 (0)