Skip to content

Commit 2c4f10c

Browse files
committed
device-server: use FileHandler instead of RotatingFileHandler for logs.
Automatically rotating the logs, with RotatingFileHandler could be useful. However, we are not actually rotating anything because we are not setting its maxBytes or backupCount values and by default it never rotates. We might as well use the standard FileHandler and come back to RotatingFileHandler later when we actually configure it.
1 parent 6571d03 commit 2c4f10c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

microscope/device_server.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
import typing
4848
from collections.abc import Iterable
4949
from dataclasses import dataclass
50-
from logging import StreamHandler
51-
from logging.handlers import RotatingFileHandler
50+
from logging import FileHandler, StreamHandler
5251
from threading import Thread
5352

5453
import Pyro4
@@ -353,7 +352,7 @@ def run(self):
353352

354353
pyro_daemon = Pyro4.Daemon(port=port, host=host)
355354

356-
log_handler = RotatingFileHandler(
355+
log_handler = FileHandler(
357356
os.path.join(
358357
self._options.logging_dir,
359358
"%s_%s_%s.log" % (cls_name, host, port),
@@ -407,7 +406,7 @@ def serve_devices(devices, options: DeviceServerOptions, exit_event=None):
407406

408407
root_logger = logging.getLogger()
409408

410-
log_handler = RotatingFileHandler("__MAIN__.log")
409+
log_handler = FileHandler("__MAIN__.log")
411410
log_handler.setFormatter(_create_log_formatter("device-server"))
412411
root_logger.addHandler(log_handler)
413412

microscope/testsuite/test_device_server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def null_logs(*args, **kwargs):
8484
return logging.NullHandler()
8585

8686
no_file = unittest.mock.patch(
87-
"microscope.device_server.RotatingFileHandler", null_logs
87+
"microscope.device_server.FileHandler", null_logs
8888
)
8989
no_stream = unittest.mock.patch(
9090
"microscope.device_server.StreamHandler", null_logs

0 commit comments

Comments
 (0)