Skip to content

Commit 2173011

Browse files
committed
More logs
1 parent ee84e3f commit 2173011

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

dls_barcode/gui/main_window.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@ def __init__(self, config, version, flags, *args, **kwargs):
4747

4848
self._frame_grabber_controller = FrameGrabberController(config, self.displayPuckScanCompleteMessage,
4949
self.displayScanTimeoutMessage, self.is_latest_holder_barcode,
50-
self.startCountdown, self.addRecordFrame, self.clear_frame, self.scanCompleted,
51-
self.displayScanErrorMessage)
50+
self.startCountdown, self.addRecordFrame, self.clear_frame, self.scanCompleted)
5251

5352

5453
def _init_ui(self):
@@ -127,16 +126,19 @@ def set_actions_triger(self):
127126
self._record_table.cell_pressed_action_triggered(self._stop_frame_grabber)
128127

129128
def _stop_frame_grabber(self):
129+
self._log.debug("Frame grabber stopper")
130130
self._scan_button.setStartLayout()
131131
self.resetCountdown()
132132
self._frame_grabber_controller.kill_grabber_thread()
133133

134134
def _start_frame_grabber(self):
135+
self._log.debug("Frame grabber started")
135136
self._scan_button.setStopLayout()
136137
self._frame_grabber_controller.start_grabber_thread(self.displayHolderFrame, self.displayPuckFrame,
137138
self.displayCameraErrorMessage)
138139

139140
def _on_about_action_clicked(self):
141+
self._log.debug("About menu clicked")
140142
QtWidgets.QMessageBox.about(self, 'About', "Version: " + self._version)
141143

142144
def _on_scan_action_clicked(self):
@@ -217,6 +219,7 @@ def startCountdown(self, duration):
217219
self._countdown_box.start_countdown(duration)
218220

219221
def resetCountdown(self):
222+
self._log.debug("Countdown re-set")
220223
self._countdown_box.reset_countdown()
221224

222225
def scanCompleted(self):
@@ -235,7 +238,7 @@ def _plate_beep(self, plate, do_beep):
235238
duration = 200
236239
Beeper.beep(frequency, duration)
237240

238-
@pyqtSlot(ScanErrorMessage)
241+
#@pyqtSlot(ScanErrorMessage)
239242
#def displayScanErrorMessage(self, scanner_msg):
240243
#self._message_box.display(MessageFactory.from_scanner_message(scanner_msg))
241244
#self._log.debug("Scan Error message", scanner_msg.content())

logconfig.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444

4545
"graylog_gelf": {
4646
"class": "pygelf.GelfUdpHandler",
47-
"level": "INFO",
47+
"level": "DEBUG",
4848
# Obviously a DLS-specific configuration: the graylog server address and port
4949
# Use the input "Load Balanced GELF TCP" on graylog2.
50-
"host": "graylog2.diamond.ac.uk",# "localhost", - use locaklhost for tests
50+
"host": "graylog2",#.diamond.ac.uk",# "localhost", - use locaklhost for tests
5151
"port": 12201,
5252
"debug": True,
5353
# The following custom fields will be disabled if setting this False

main.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from dls_barcode.gui.main_window import DiamondBarcodeMainWindow
22

33
import logging
4+
import logconfig
45
import sys
56

67
from os.path import dirname
@@ -29,7 +30,8 @@
2930

3031

3132
def main(config_file, version):
32-
# Start process logge
33+
# Start process logger
34+
logconfig.setup_logging()
3335

3436
log = logging.getLogger(".".join([__name__]))
3537
log.info("CONFIG: " + config_file)

0 commit comments

Comments
 (0)