From 4e01bea0e359d10b3ed209f4838e4b1eeed40674 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Wed, 31 Aug 2022 12:22:46 +0000
Subject: [PATCH] L2SS-863: Fix refactored interface
---
.../tangostationcontrol/statistics/writer.py | 6 +++---
.../tangostationcontrol/statistics_writer/hdf5_writer.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tangostationcontrol/tangostationcontrol/statistics/writer.py b/tangostationcontrol/tangostationcontrol/statistics/writer.py
index 1138fa52f..020151b95 100644
--- a/tangostationcontrol/tangostationcontrol/statistics/writer.py
+++ b/tangostationcontrol/tangostationcontrol/statistics/writer.py
@@ -115,7 +115,7 @@ def _start_loop(receiver, writer, reconnect, filename):
"""Main loop"""
try:
while True:
- _receive_packets(receiver, writer, reconnect, filename, device)
+ _receive_packets(receiver, writer, reconnect, filename)
except KeyboardInterrupt:
# user abort, don't complain
logger.warning("Received keyboard interrupt. Stopping.")
@@ -123,10 +123,10 @@ def _start_loop(receiver, writer, reconnect, filename):
writer.close_writer()
-def _receive_packets(receiver, writer, reconnect, filename, device):
+def _receive_packets(receiver, writer, reconnect, filename):
try:
packet = receiver.get_packet()
- writer.next_packet(packet, device)
+ writer.next_packet(packet)
except EOFError:
if reconnect and not filename:
logger.warning("Connection lost, attempting to reconnect")
diff --git a/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py b/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py
index cfc84b4cf..4ac9dd9d4 100644
--- a/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py
+++ b/tangostationcontrol/tangostationcontrol/statistics_writer/hdf5_writer.py
@@ -270,7 +270,7 @@ class HDF5Writer(ABC):
finally:
filename = str(self.file)
self.file.close()
- logger.debug("%S closed", filename)
+ logger.debug("%s closed", filename)
logger.debug(
"Received a total of %d statistics while running. With "
"%d written to disk",
--
GitLab