diff --git a/deployments/charts/router/templates/router-service.yaml b/deployments/charts/router/templates/router-service.yaml index 83db1c4a7..ffa34d2ca 100644 --- a/deployments/charts/router/templates/router-service.yaml +++ b/deployments/charts/router/templates/router-service.yaml @@ -78,8 +78,6 @@ spec: args: - --hostname - {{ .Values.services.service.hostname }} - - --webserver_enabled - - {{ .Values.services.service.webserverEnabled | quote }} - --postgres_host - {{ .Values.services.postgres.serviceName }} - --postgres_port diff --git a/src/service/logger/ctrl_websocket.py b/src/service/logger/ctrl_websocket.py index c5b7fc7ac..d80e317aa 100644 --- a/src/service/logger/ctrl_websocket.py +++ b/src/service/logger/ctrl_websocket.py @@ -96,7 +96,7 @@ async def update_barrier(database, redis_client, workflow_id: str, group_name: s if count <= 0: count = task.TaskGroup.fetch_active_group_size(database, workflow_id, group_name) - logging.info('Add member %s from barrier %s', task_name, key) + logging.info('Add member %s to barrier %s', task_name, key) await redis_client.sadd(key, task_name) await redis_client.expire(key, total_timeout, nx=True) barrier_set = await redis_client.smembers(key) diff --git a/src/service/router/router.py b/src/service/router/router.py index 35c343476..2f351b584 100644 --- a/src/service/router/router.py +++ b/src/service/router/router.py @@ -49,10 +49,6 @@ class RouterServiceConfig(src.lib.utils.logging.LoggingConfig, static_config.Sta command_line='timeout', default=60, description='Timeout for router connections.') - webserver_enabled: bool = pydantic.Field( - command_line='webserver_enabled', - default=False, - description='Whether webserver is enabled during deployment.') webserver_initial_timeout: int = pydantic.Field( command_line='webserver_initial_timeout', default=60 * 60, # 1 hour in seconds @@ -138,12 +134,6 @@ def is_session_alive(key: str) -> bool: return key.lower() in webservers -# Endpoint for UI to determine whether to show the port forwarding button -@app.get('/api/router/webserver_enabled') -def is_webserver_enabled() -> bool: - return RouterServiceConfig.load().webserver_enabled - - @app.websocket('/api/router/exec/{name}/backend/{key}') @app.websocket('/api/router/portforward/{name}/backend/{key}') @app.websocket('/api/router/rsync/{name}/backend/{key}') diff --git a/src/utils/connectors/postgres.py b/src/utils/connectors/postgres.py index 990379338..ed790898a 100644 --- a/src/utils/connectors/postgres.py +++ b/src/utils/connectors/postgres.py @@ -4032,7 +4032,6 @@ def has_access(self, path: str, method: str) -> bool: role.RoleAction(base='http', path='/api/plugins/configs', method='*'), # Tailing slash is to exclude path /api/router/webserver/*/backend/* role.RoleAction(base='http', path='/api/router/webserver/*/', method='*'), - role.RoleAction(base='http', path='/api/router/webserver_enabled', method='*'), role.RoleAction(base='http', path='/api/router/*/*/client/*', method='*'), ] )