Merge branch 'master' of git.km3net.de:km3py/km3mon

Makefile.in

@@ -37,7 +37,7 @@ start:
 	@echo Starting the web server on 0.0.0.0:${WEBSERVER_PORT}
 	@#
 	@tmux send-keys -t ${SESSION_NAME}:main.3  \
-	    "gunicorn -w 4 -b 0.0.0.0:${WEBSERVER_PORT} km3mon:app" Enter
+	    "gunicorn --pid gunicorn.pid -w 4 -b 0.0.0.0:${WEBSERVER_PORT} km3mon:app" Enter
 	@tmux select-layout even-vertical
 
 	@echo Starting the monitoring scripts
@@ -91,17 +91,21 @@ start:
 	    "python scripts/ahrs_calibration.py -d ${DETECTOR_ID} -p ${MONITORING_LIGIER_PORT}" Enter
 	@tmux select-layout even-vertical
 
-	@# Log.io
+	@# Logs
 	@#
-	@tmux new-window -n logio -t ${SESSION_NAME}
-	@tmux split-window -v -t ${SESSION_NAME}:logio
-	@tmux send-keys -t ${SESSION_NAME}:logio.1  \
-	    "python scripts/logio.py -p ${MONITORING_LIGIER_PORT} -x ${LOGIO_IP} -q ${LOGIO_PORT}" Enter
+	@tmux new-window -n log -t ${SESSION_NAME}
+	@tmux split-window -v -t ${SESSION_NAME}:log
+	@tmux send-keys -t ${SESSION_NAME}:log.1  \
+	    "python scripts/msg_dumper.py -l 127.0.0.1 -p ${MONITORING_LIGIER_PORT} -f logs/MSG.log" Enter
+	@tmux send-keys -t ${SESSION_NAME}:log.2  \
+	    "touch logs/MSG.log && frontail logs/*.log --ui-highlight --ui-highlight-preset frontail.json --theme dark -l 10000 -n 200 -p 8082" Enter
 	@tmux select-layout even-vertical
 
 stop:
+	@echo Stopping monitoring session...
 	tmux kill-session -t ${SESSION_NAME}
-	killall gunicorn
+	kill -9 $(shell cat gunicorn.pid)
+	@sleep 5
 
 clean:
 	rm Makefile

scripts/msg_dumper.py

@@ -42,6 +42,7 @@ class MSGDumper(Module):
         entry = "{} [{}]: {}\n".format(
             os.path.basename(self.filename), source, data)
         self.fobj.write(entry)
+        self.fobj.flush()
         return blob
 
     def finish(self):

scripts/pmt_rates.py

@@ -96,7 +96,7 @@ class PMTRates(kp.Module):
 
     def update_plot(self):
         filename = os.path.join(self.plot_path, self.filename)
-        print("Updating plot at {}".format(filename))
+        self.log.debug("Updating plot at {}".format(filename))
         now = time.time()
         max_x = self.max_x
         interval = self.interval

scripts/ztplot.py

@@ -60,6 +60,7 @@ class ZTPlot(Module):
     def configure(self):
         self.plots_path = self.require('plots_path')
         self.ytick_distance = self.get('ytick_distance', default=200)
+        self.min_dus = self.get('min_dus', default=1)
         det_id = self.require('det_id')
         self.calib = kp.calib.Calibration(det_id=det_id)
 
@@ -78,7 +79,7 @@ class ZTPlot(Module):
         event_info = blob['EventInfo']
 
         n_triggered_dus = np.unique(hits[hits.triggered == True].du)
-        if n_triggered_dus < 1:
+        if n_triggered_dus < self.min_dus:
             print("Skipping...")
             return blob