Merge pull request #93 from kiemlicz/master

MQTT_TOPIC comma separated

Author: kpetremann

README.md

@@ -114,7 +114,7 @@ The list of parameters are:
   * `MQTT_IGNORED_TOPICS`: Comma-separated lists of topics to ignore. Accepts wildcards. (default: None)
   * `MQTT_ADDRESS`: IP or hostname of MQTT broker (default: 127.0.0.1)
   * `MQTT_PORT`: TCP port of MQTT broker (default: 1883)
-  * `MQTT_TOPIC`: Topic path to subscribe to (default: #)
+  * `MQTT_TOPIC`: Comma-separated lists of topics to subscribe to (default: #)
   * `MQTT_KEEPALIVE`: Keep alive interval to maintain connection with MQTT broker (default: 60)
   * `MQTT_USERNAME`: Username which should be used to authenticate against the MQTT broker (default: None)
   * `MQTT_PASSWORD`: Password which should be used to authenticate against the MQTT broker (default: None)

mqtt_exporter/main.py

@@ -75,8 +75,9 @@ def subscribe(client, _, __, reason_code, properties):
 
     client.user_data_set(user_data)
 
-    LOG.info('subscribing to "%s"', settings.TOPIC)
-    client.subscribe(settings.TOPIC)
+    for s in settings.TOPIC.split(","):
+        LOG.info('subscribing to "%s"', s)
+        client.subscribe(s)
     if reason_code != mqtt.CONNACK_ACCEPTED:
         LOG.error("MQTT %s", mqtt.connack_string(reason_code))