Skip to content

Commit 2ca5c51

Browse files
author
Joel Collins
committed
Fixed manky slashes
1 parent b6bfad0 commit 2ca5c51

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

labthings/server/labthing.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def _create_base_routes(self):
160160
self.add_view(TaskView, "/tasks/<task_id>", endpoint=TASK_ENDPOINT)
161161

162162
def _create_base_sockets(self):
163-
self.sockets.add_url_rule(f"{self.url_prefix}", self._socket_handler)
163+
self.sockets.add_url_rule(self._complete_url("", ""), self._socket_handler)
164164

165165
def _socket_handler(self, ws):
166166
# Create a socket subscriber
@@ -232,7 +232,12 @@ def _complete_url(self, url_part, registration_prefix):
232232
blueprint. Generally speaking, BlueprintSetupState.url_prefix
233233
"""
234234
parts = [registration_prefix, self.url_prefix, url_part]
235-
return "".join([part for part in parts if part])
235+
u = "".join([part for part in parts if part])
236+
if u == "":
237+
u = "/"
238+
if u[0] != "/":
239+
u = f"/{u}"
240+
return u
236241

237242
def add_view(self, resource, *urls, endpoint=None, **kwargs):
238243
"""Adds a view to the api.

0 commit comments

Comments
 (0)