3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

database: allow synchronous calls before the server starts 

It is possible that Moonraker can be instantiated while the eventloop
is running during tests.  To avoid errors allow synchronous calls until
the server starts.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-02-04 19:37:13 -05:00
parent 9ab6d0e83d
commit 3c92f42d49
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
moonraker/components/database.py
View File

@ -166,7 +166,7 @@ class MoonrakerDatabase:
with self.thread_lock:
return command_func(*args)
if self.eventloop.is_running():
if self.server.is_running():
return cast(Future, self.eventloop.run_in_thread(func_wrapper))
else:
ret = func_wrapper()
@ -551,10 +551,10 @@ class MoonrakerDatabase:
namespace: str,
forbidden: bool = False
) -> None:
if self.eventloop.is_running():
if self.server.is_running():
raise self.server.error(
"Cannot register a namespace while the "
"eventloop is running")
"server is running")
if namespace not in self.namespaces:
self.namespaces[namespace] = self.lmdb_env.open_db(
namespace.encode())
@ -573,10 +573,10 @@ class MoonrakerDatabase:
namespace: str,
parse_keys: bool = True
) -> NamespaceWrapper:
if self.eventloop.is_running():
if self.server.is_running():
raise self.server.error(
"Cannot wrap a namespace while the "
"eventloop is running")
"server is running")
if namespace not in self.namespaces:
raise self.server.error(
f"Namespace '{namespace}' not found", 404)
@ -836,7 +836,7 @@ class NamespaceWrapper:
key: Union[List[str], str],
default: Any = SENTINEL
) -> Union[Future[Any], Task[Any]]:
if not self.eventloop.is_running():
if not self.server.is_running():
try:
val = self.delete(key).result()
except Exception:
@ -861,7 +861,7 @@ class NamespaceWrapper:
return self.db.clear_namespace(self.namespace)
def _check_sync_method(self, func_name: str) -> None:
if self.eventloop.is_running():
if self.server.is_running():
raise self.server.error(
f"Cannot call method {func_name} while "
"the eventloop is running")