Merge branch 'master' into task-logging-test

labthings · Apr 23, 2020 · 29538fc · 29538fc
2 parents 24df9b5 + 6ae5f93
commit 29538fc
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 28 deletions.
diff --git a/labthings/core/tasks/thread.py b/labthings/core/tasks/thread.py
@@ -130,7 +130,7 @@ def terminate(self):
 
 
 class ThreadLogHandler(logging.Handler):
-    def __init__(self, thread=None, dest=None, level=logging.WARNING):
+    def __init__(self, thread=None, dest=None, level=logging.INFO):
         """Set up a log handler that appends messages to a list.
 
         This log handler will first filter by ``thread``, if one is

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,7 +11,7 @@ marshmallow = "^3.4.0"
 webargs = "^6.0.0"
 apispec = "^3.2.0"
 flask-cors = "^3.0.8"
-gevent = "^1.4.0"
+gevent = ">=1.4,<21.0"
 gevent-websocket = "^0.10.1"
 zeroconf = ">=0.24.5,<0.26.0"