From 1cf6c76a7d066f3d24b956fb86edad0ae7faeed4 Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <woho@hottis.de>
Date: Mon, 28 Aug 2017 12:44:10 +0200
Subject: [PATCH] again improve debug output

---
 dist/mongosave.js | 22 +++++++++++-----------
 src/mongosave.ts  | 40 +++++++++++-----------------------------
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/dist/mongosave.js b/dist/mongosave.js
index 06daaf4..823b13e 100644
--- a/dist/mongosave.js
+++ b/dist/mongosave.js
@@ -12,42 +12,42 @@ class MongoSave extends CallChain.AAsyncBaseChainItem {
     }
     func(message, finished) {
         if (!this.dbh) {
-            log.info("Not database connection yet");
+            log.info("MongoSave: Not database connection yet");
             if (!this.connectPending) {
                 this.connectPending = true;
                 this.mongoClient.connect(this.url)
                     .then((db) => {
-                    log.info("Successfully opened MongoDB connect");
+                    log.info("MongoSave: Successfully opened MongoDB connect");
                     this.dbh = db;
                 })
                     .catch((err) => {
-                    log.error(`Failure when opening MongoDB connect: ${err}`);
+                    log.error(`MongoSave: Failure when opening MongoDB connect: ${err}`);
                     this.dbh = undefined;
                 });
             }
             else {
-                log.info("Connecting to database is pending");
+                log.info("MongoSave: Connecting to database is pending");
             }
         }
         if (this.dbh) {
-            log.info("Database handle is available");
+            log.info("MongoSave: Database handle is available");
             let coll = this.dbh.collection("iot");
             coll.insertOne(message)
                 .then((res) => {
-                log.info(`Successfully wrote one item in database: ${res.insertedId}`);
+                log.info(`MongoSave: Successfully wrote one item in database: ${res.insertedId}`);
                 let nextValue = { id: res.insertedId, payload: message };
                 finished(nextValue);
             })
                 .catch((err) => {
-                log.error(`Failure when trying to write one item in database: ${err}`);
-                log.error("Chain interrupted");
+                log.error(`MongoSave: Failure when trying to write one item in database: ${err}`);
+                log.error("MongoSave: Chain interrupted");
             });
         }
         else {
-            log.error(`No database connection yet, drop message ${message}`);
-            log.error("Chain interrupted");
+            log.error(`MongoSave: No database connection yet, drop message ${message}`);
+            log.error("MongoSave: Chain interrupted");
         }
-        log.info(`Returning from ${this.label}`);
+        log.info(`MongoSave: Returning from ${this.label}`);
     }
 }
 exports.MongoSave = MongoSave;
diff --git a/src/mongosave.ts b/src/mongosave.ts
index ce34ad6..304309f 100644
--- a/src/mongosave.ts
+++ b/src/mongosave.ts
@@ -23,57 +23,39 @@ export class MongoSave extends CallChain.AAsyncBaseChainItem  {
 
     protected func(message : any, finished : (message : any) => void) : void {
         if (! this.dbh) {
-            log.info("Not database connection yet")
+            log.info("MongoSave: Not database connection yet")
             if (! this.connectPending) {
                 this.connectPending = true
                 this.mongoClient.connect(this.url)
                     .then((db:MongoDB.Db) => { 
-                        log.info("Successfully opened MongoDB connect")
+                        log.info("MongoSave: Successfully opened MongoDB connect")
                         this.dbh = db
                     })
                     .catch((err) => {
-                        log.error(`Failure when opening MongoDB connect: ${err}`)
+                        log.error(`MongoSave: Failure when opening MongoDB connect: ${err}`)
                         this.dbh = undefined
                     })
             } else {
-                log.info("Connecting to database is pending")
+                log.info("MongoSave: Connecting to database is pending")
             }
         }
         if (this.dbh) {
-            log.info("Database handle is available")
+            log.info("MongoSave: Database handle is available")
             let coll : MongoDB.Collection = this.dbh.collection("iot")
             coll.insertOne(message)
                 .then((res : MongoDB.InsertOneWriteOpResult) => {
-                    log.info(`Successfully wrote one item in database: ${res.insertedId}`)
+                    log.info(`MongoSave: Successfully wrote one item in database: ${res.insertedId}`)
                     let nextValue = <MongoItem>{id: res.insertedId, payload: message}
                     finished(nextValue)
                 })
                 .catch((err : any) => {
-                    log.error(`Failure when trying to write one item in database: ${err}`)
-                    log.error("Chain interrupted")
+                    log.error(`MongoSave: Failure when trying to write one item in database: ${err}`)
+                    log.error("MongoSave: Chain interrupted")
                 })
         } else {
-            log.error(`No database connection yet, drop message ${message}`)
-            log.error("Chain interrupted")
+            log.error(`MongoSave: No database connection yet, drop message ${message}`)
+            log.error("MongoSave: Chain interrupted")
         }
-        log.info(`Returning from ${this.label}`)
+        log.info(`MongoSave: Returning from ${this.label}`)
     }
-
-    /*
-    public begin() :void {
-        if (this._next != null) {
-            this._next.begin()
-        }
-        this.addListener('yourturn', (message : any) : void => {
-            log.info(`Calling ${this.toString()}`)
-            let result : any = this.func(message)
-            if (this._next == null) {
-                log.info(`Last chain item, final result ${result}`)
-            } else {
-                this._next.send(result)
-            }
-        })
-    }
-    */
-
 }