Merge branch 'master' into alpha

# Conflicts:
#	service.py
This commit is contained in:
mac12m99
2021-05-21 20:34:14 +02:00
15 changed files with 76 additions and 55 deletions
+1 -1
View File
@@ -593,7 +593,7 @@ class SqliteMultithread(Thread):
while time.time() - start_time < self.timeout:
if self._sqlitedict_thread_initialized or self.exception:
return
time.sleep(0.1)
time.sleep(0.01)
raise TimeoutError("SqliteMultithread failed to flag initialization withing %0.0f seconds." % self.timeout)