From ac5566a4028804c261967d0674a04b5452fad481 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <woho@hottis.de>
Date: Thu, 27 Jul 2017 23:58:14 +0200
Subject: [PATCH] callback name

---
 dist/main.js       | 1 +
 dist/mqttclient.js | 5 +++--
 src/main.ts        | 1 +
 src/mqttclient.ts  | 5 +++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dist/main.js b/dist/main.js
index ef16fd5..77dd7e8 100644
--- a/dist/main.js
+++ b/dist/main.js
@@ -11,6 +11,7 @@ class Dispatcher {
             return `<<${message}>>`;
         });
         this._mqttClient.register('IoT/Device/#', mqtt.passThrough);
+        this._mqttClient.register('IoT/Device/#', mqtt.passThrough);
     }
     exec() {
         log.info("Dispatcher starting");
diff --git a/dist/mqttclient.js b/dist/mqttclient.js
index de81bc4..1028fd1 100644
--- a/dist/mqttclient.js
+++ b/dist/mqttclient.js
@@ -14,17 +14,18 @@ class MqttClient {
     }
     register(topic, callback) {
         let done = false;
+        let callbackName = (callback.name === "") ? "lambda" : callback.name;
         for (let topicHandler of this._topicHandlers) {
             if (topicHandler.topic === topic) {
                 topicHandler.callbacks.push(callback);
                 done = true;
-                log.info(`additional callback added for topic ${topic}`);
+                log.info(`additional callback <${callbackName}> added for topic ${topic}`);
             }
         }
         if (!done) {
             let cbs = [callback];
             this._topicHandlers.push({ topic: topic, callbacks: cbs });
-            log.info(`first callback added for topic ${topic}`);
+            log.info(`first callback <${callbackName}> added for topic ${topic}`);
         }
     }
     exec() {
diff --git a/src/main.ts b/src/main.ts
index e836060..6eb5a64 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -13,6 +13,7 @@ class Dispatcher {
             return `<<${message}>>`
         })
         this._mqttClient.register('IoT/Device/#', mqtt.passThrough)
+        this._mqttClient.register('IoT/Device/#', mqtt.passThrough)
     }
 
     exec() : void {
diff --git a/src/mqttclient.ts b/src/mqttclient.ts
index 168e17d..148c78f 100644
--- a/src/mqttclient.ts
+++ b/src/mqttclient.ts
@@ -26,17 +26,18 @@ export class MqttClient {
 
     register(topic: string, callback: TopicHandlerCallback) : void {
         let done: boolean = false
+        let callbackName : string = (callback.name === "") ? "lambda" : callback.name
         for (let topicHandler of this._topicHandlers) {
             if (topicHandler.topic === topic) {
                 topicHandler.callbacks.push(callback)
                 done = true
-                log.info(`additional callback added for topic ${topic}`)
+                log.info(`additional callback <${callbackName}> added for topic ${topic}`)
             }
         }
         if (! done) {
             let cbs : TopicHandlerCallback[] = [ callback ]
             this._topicHandlers.push({topic:topic, callbacks:cbs})
-            log.info(`first callback added for topic ${topic}`)
+            log.info(`first callback <${callbackName}> added for topic ${topic}`)
         }
     }