Skip to content

Commit 1db71f0

Browse files
committed
Formatted code
1 parent d5a2efc commit 1db71f0

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

src/labthings/server/logging.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ def emit(self, record):
1515
current_labthing().emit("logging", log_event)
1616

1717
def rest_format_record(self, record):
18-
return {"message": str(record.msg), "level": record.levelname.lower()}
18+
return {"message": str(record.msg), "level": record.levelname.lower()}

src/labthings/server/wsgi/gevent.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
sentinel = object()
1313

14+
1415
class Server:
1516
def __init__(
1617
self,
@@ -136,7 +137,7 @@ def start(self):
136137
app_to_run,
137138
handler_class=WebSocketHandler,
138139
log=self.log,
139-
error_log=self.error_log
140+
error_log=self.error_log,
140141
)
141142

142143
# Serve
@@ -153,7 +154,13 @@ def start(self):
153154
self.stop() # pragma: no cover
154155

155156
def run(
156-
self, host=None, port=None, log=sentinel, error_log=sentinel, debug=None, zeroconf=None,
157+
self,
158+
host=None,
159+
port=None,
160+
log=sentinel,
161+
error_log=sentinel,
162+
debug=None,
163+
zeroconf=None,
157164
):
158165
"""Starts the server allowing for runtime parameters. Designed to immitate
159166
the old Flask app.run style of starting an app

src/labthings/server/wsgi/handler.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@
22

33
from logging import getLogger, StreamHandler, getLoggerClass, Formatter, DEBUG
44

5+
56
def create_logger(name, handlers=None, debug=False):
6-
if not handlers:
7-
handlers = ()
7+
if not handlers:
8+
handlers = ()
9+
10+
logger = getLogger(name)
811

9-
logger = getLogger(name)
12+
for handler in handlers:
13+
logger.addHandler(handler)
1014

11-
for handler in handlers:
12-
logger.addHandler(handler)
15+
return logger
1316

14-
return logger
1517

1618
class WebSocketHandler(_WebSocketHandler):
1719
@property
1820
def logger(self):
1921
if not hasattr(self, "_logger"):
20-
if hasattr(self.server, 'log'):
21-
self._logger = create_logger(__name__, handlers=(self.server.log, ))
22+
if hasattr(self.server, "log"):
23+
self._logger = create_logger(__name__, handlers=(self.server.log,))
2224
else:
2325
self._logger = create_logger(__name__)
2426

0 commit comments

Comments
 (0)