diff --git a/.classpath b/.classpath index 9855d06..566accb 100644 --- a/.classpath +++ b/.classpath @@ -5,5 +5,7 @@ + + diff --git a/bin/de/hottis/MeasurementCollector/ADataObject.class b/bin/de/hottis/MeasurementCollector/ADataObject.class index fe44849..e02d929 100644 Binary files a/bin/de/hottis/MeasurementCollector/ADataObject.class and b/bin/de/hottis/MeasurementCollector/ADataObject.class differ diff --git a/bin/de/hottis/MeasurementCollector/ADataParser.class b/bin/de/hottis/MeasurementCollector/ADataParser.class index 927f512..2b08041 100644 Binary files a/bin/de/hottis/MeasurementCollector/ADataParser.class and b/bin/de/hottis/MeasurementCollector/ADataParser.class differ diff --git a/bin/de/hottis/MeasurementCollector/AMessageParser.class b/bin/de/hottis/MeasurementCollector/AMessageParser.class index 97125ce..86e71a6 100644 Binary files a/bin/de/hottis/MeasurementCollector/AMessageParser.class and b/bin/de/hottis/MeasurementCollector/AMessageParser.class differ diff --git a/bin/de/hottis/MeasurementCollector/MBusParser.class b/bin/de/hottis/MeasurementCollector/MBusParser.class index 1bdb046..51e651c 100644 Binary files a/bin/de/hottis/MeasurementCollector/MBusParser.class and b/bin/de/hottis/MeasurementCollector/MBusParser.class differ diff --git a/bin/de/hottis/MeasurementCollector/MeasurementCollector.class b/bin/de/hottis/MeasurementCollector/MeasurementCollector.class index 13d4fa5..0c74550 100644 Binary files a/bin/de/hottis/MeasurementCollector/MeasurementCollector.class and b/bin/de/hottis/MeasurementCollector/MeasurementCollector.class differ diff --git a/bin/de/hottis/MeasurementCollector/MqttReceiver$Listener.class b/bin/de/hottis/MeasurementCollector/MqttReceiver$Listener.class index 5eeadad..a81de45 100644 Binary files a/bin/de/hottis/MeasurementCollector/MqttReceiver$Listener.class and b/bin/de/hottis/MeasurementCollector/MqttReceiver$Listener.class differ diff --git a/bin/de/hottis/MeasurementCollector/MqttReceiver.class b/bin/de/hottis/MeasurementCollector/MqttReceiver.class index 993fb3d..e5f3bd1 100644 Binary files a/bin/de/hottis/MeasurementCollector/MqttReceiver.class and b/bin/de/hottis/MeasurementCollector/MqttReceiver.class differ diff --git a/src/de/hottis/MeasurementCollector/ADataObject.java b/src/de/hottis/MeasurementCollector/ADataObject.java index 1464a8b..5e99256 100644 --- a/src/de/hottis/MeasurementCollector/ADataObject.java +++ b/src/de/hottis/MeasurementCollector/ADataObject.java @@ -3,7 +3,12 @@ package de.hottis.MeasurementCollector; import java.time.LocalDateTime; import java.util.Map; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public abstract class ADataObject { + final protected Logger logger = LogManager.getRootLogger(); + private LocalDateTime timestamp; private String name; private Map values; diff --git a/src/de/hottis/MeasurementCollector/ADataParser.java b/src/de/hottis/MeasurementCollector/ADataParser.java index ea955dd..e69995e 100644 --- a/src/de/hottis/MeasurementCollector/ADataParser.java +++ b/src/de/hottis/MeasurementCollector/ADataParser.java @@ -3,9 +3,13 @@ package de.hottis.MeasurementCollector; import java.time.LocalDateTime; import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openmuc.jmbus.DataRecord; public abstract class ADataParser { + final protected Logger logger = LogManager.getRootLogger(); + protected String name; public ADataParser(String name) { diff --git a/src/de/hottis/MeasurementCollector/AMessageParser.java b/src/de/hottis/MeasurementCollector/AMessageParser.java index 2f54681..cb2f055 100644 --- a/src/de/hottis/MeasurementCollector/AMessageParser.java +++ b/src/de/hottis/MeasurementCollector/AMessageParser.java @@ -3,7 +3,12 @@ package de.hottis.MeasurementCollector; import java.time.LocalDateTime; import java.util.Properties; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + public abstract class AMessageParser { + final protected Logger logger = LogManager.getRootLogger(); + private String topic; protected DataObjectQueue queue; protected Properties config; diff --git a/src/de/hottis/MeasurementCollector/MBusParser.java b/src/de/hottis/MeasurementCollector/MBusParser.java index 147ff41..529b41f 100644 --- a/src/de/hottis/MeasurementCollector/MBusParser.java +++ b/src/de/hottis/MeasurementCollector/MBusParser.java @@ -48,7 +48,7 @@ public class MBusParser extends AMessageParser { ADataParser dataParser = (ADataParser) constructor.newInstance(nameInDatabase); dataParsers.put(nameInMsg, dataParser); - System.out.println(dataParserClassName + " registered for " + nameInMsg + ", " + nameInDatabase); + logger.info(dataParserClassName + " registered for " + nameInMsg + ", " + nameInDatabase); } } } @@ -82,16 +82,16 @@ public class MBusParser extends AMessageParser { List measurementItems = dataParsers.get(name).parse(timestamp, dataRecords); for (ADataObject ado : measurementItems) { - System.out.println(ado); + logger.debug(ado); } queue.add(measurementItems); - System.out.println("Queue size: " + queue.size()); + logger.debug("Queue size: " + queue.size()); } else { - System.out.println("unknown name: " + name); + logger.warn("unknown name: " + name); } } catch (Exception e) { - System.out.println("Exception when handling mbus message: " + e); + logger.error("Exception when handling mbus message: " + e); } } diff --git a/src/de/hottis/MeasurementCollector/MeasurementCollector.java b/src/de/hottis/MeasurementCollector/MeasurementCollector.java index 1f151b6..8feeaee 100644 --- a/src/de/hottis/MeasurementCollector/MeasurementCollector.java +++ b/src/de/hottis/MeasurementCollector/MeasurementCollector.java @@ -2,12 +2,17 @@ package de.hottis.MeasurementCollector; import java.util.Properties; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + + public class MeasurementCollector { static final String PROPS_FILENAME = "measurementCollector.props"; + static final Logger logger = LogManager.getRootLogger(); public static void main(String[] args) throws Exception { - System.out.println("MeasurementCollector starting"); + logger.info("MeasurementCollector starting"); final Properties config = new Properties(); config.load(MeasurementCollector.class.getClassLoader().getResourceAsStream(PROPS_FILENAME)); diff --git a/src/de/hottis/MeasurementCollector/MqttReceiver.java b/src/de/hottis/MeasurementCollector/MqttReceiver.java index 42491b1..e7b6b10 100644 --- a/src/de/hottis/MeasurementCollector/MqttReceiver.java +++ b/src/de/hottis/MeasurementCollector/MqttReceiver.java @@ -4,6 +4,8 @@ import java.time.LocalDateTime; import java.util.HashMap; import java.util.Properties; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.eclipse.paho.client.mqttv3.IMqttMessageListener; import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; @@ -13,6 +15,8 @@ import org.eclipse.paho.client.mqttv3.MqttMessage; public class MqttReceiver { + final protected Logger logger = LogManager.getRootLogger(); + static final String MQTT_BROKER_PROP = "mqtt.broker"; static final String MQTT_CLIENTID_PROP = "mqtt.clientid"; static final String MQTT_USERNAME_PROP = "mqtt.username"; @@ -50,11 +54,7 @@ public class MqttReceiver { try { client = new MqttClient(broker, clientId); client.connect(connOpts); - while (! client.isConnected()) { - System.out.print("."); - } - System.out.println(); - System.out.println("Connected"); + logger.info("Connected"); } catch (MqttException e) { throw new MeasurementCollectorException("MqttReceiver.connect", e); } @@ -64,7 +64,7 @@ public class MqttReceiver { try { parsers.put(parser.getTopic(), parser); client.subscribe(parser.getTopic(), listener); - System.out.println("Subscribed: " + parser.getTopic()); + logger.info("Subscribed: " + parser.getTopic()); } catch (MqttException e) { throw new MeasurementCollectorException("MqttReceiver.registerParser", e); }