diff --git a/tangostationcontrol/tangostationcontrol/statistics/writer.py b/tangostationcontrol/tangostationcontrol/statistics/writer.py index 1138fa52fbe48f80742dc6dd7acd31236e642276..020151b9523767aee745a2229ebe9e4935fc55b8 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 cfc84b4cf49c2a481e19fb831b7f84cbacd2e0c0..4ac9dd9d451ae77a93b0f5f0d848d4de138cfd8c 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",