add diff debug logging of common db commands

Author: skadefro

OpenFlow/src/Config.ts

@@ -19,6 +19,11 @@ export class Config {
         Config.getversion();
         Config.logpath = Config.getEnv("logpath", __dirname);
         Config.log_queries = Config.parseBoolean(Config.getEnv("log_queries", "false"));
+        Config.log_aggregates = Config.parseBoolean(Config.getEnv("log_aggregates", "false"));
+        Config.log_inserts = Config.parseBoolean(Config.getEnv("log_inserts", "false"));
+        Config.log_updates = Config.parseBoolean(Config.getEnv("log_updates", "false"));
+        Config.log_deletes = Config.parseBoolean(Config.getEnv("log_deletes", "false"));
+
         Config.getting_started_url = Config.getEnv("getting_started_url", "");
 
         Config.NODE_ENV = Config.getEnv("NODE_ENV", "development");
@@ -97,6 +102,11 @@ export class Config {
     public static version: string = Config.getversion();
     public static logpath: string = Config.getEnv("logpath", __dirname);
     public static log_queries: boolean = Config.parseBoolean(Config.getEnv("log_queries", "false"));
+    public static log_aggregates: boolean = Config.parseBoolean(Config.getEnv("log_aggregates", "false"));
+    public static log_inserts: boolean = Config.parseBoolean(Config.getEnv("log_inserts", "false"));
+    public static log_updates: boolean = Config.parseBoolean(Config.getEnv("log_updates", "false"));
+    public static log_deletes: boolean = Config.parseBoolean(Config.getEnv("log_deletes", "false"));
+
     public static getting_started_url: string = Config.getEnv("getting_started_url", "");
 
     public static NODE_ENV: string = Config.getEnv("NODE_ENV", "development");

OpenFlow/src/DatabaseConnection.ts

@@ -492,6 +492,8 @@ export class DatabaseConnection {
         options.hint = myhint;
         const items: T[] = await this.db.collection(collectionname).aggregate(aggregates, options).toArray();
         DatabaseConnection.traversejsondecode(items);
+        const user: TokenUser = Crypt.verityToken(jwt);
+        if (Config.log_aggregates) this._logger.debug("[" + user.username + "][" + collectionname + "] aggregate gave " + items.length + " results ");
         return items;
     }
     /**
@@ -721,6 +723,7 @@ export class DatabaseConnection {
             await this.db.collection(collectionname).replaceOne({ _id: item._id }, item);
         }
         DatabaseConnection.traversejsondecode(item);
+        if (Config.log_inserts) this._logger.debug("[" + user.username + "][" + collectionname + "] inserted " + item.name);
         return item;
     }
     /**
@@ -957,6 +960,7 @@ export class DatabaseConnection {
         } catch (error) {
             throw error;
         }
+        if (Config.log_updates) this._logger.debug("[" + user.username + "][" + q.collectionname + "] updated " + q.item.name);
         return q;
     }
     /**
@@ -1041,6 +1045,7 @@ export class DatabaseConnection {
             // } else {
             //     throw Error("UpdateOne failed!!!");
             // }
+            if (Config.log_updates && q.opresult) this._logger.debug("[" + user.username + "][" + q.collectionname + "] updated " + q.opresult.modifiedCount + " items");
             return q;
         } catch (error) {
             throw error;
@@ -1088,15 +1093,15 @@ export class DatabaseConnection {
         if (!this.hasAuthorization(user, q.item, Rights.update)) { throw new Error("Access denied, no authorization to InsertOrUpdateOne"); }
         // if (q.item._id !== null && q.item._id !== undefined && q.item._id !== "") {
         if (exists.length == 1) {
-            this._logger.silly("[" + user.username + "][" + q.collectionname + "] InsertOrUpdateOne, Updating found one in database");
+            if (Config.log_updates) this._logger.debug("[" + user.username + "][" + q.collectionname + "] InsertOrUpdateOne, Updating found one in database");
             const uq = new UpdateOneMessage();
             // uq.query = query; 
             uq.item = q.item; uq.collectionname = q.collectionname; uq.w = q.w; uq.j; uq.jwt = q.jwt;
             const uqres = await this.UpdateOne(uq);
             q.opresult = uqres.opresult;
             q.result = uqres.result;
         } else {
-            this._logger.silly("[" + user.username + "][" + q.collectionname + "] InsertOrUpdateOne, Inserting as new in database");
+            if (Config.log_updates) this._logger.debug("[" + user.username + "][" + q.collectionname + "] InsertOrUpdateOne, Inserting as new in database");
             q.result = await this.InsertOne(q.item, q.collectionname, q.w, q.j, q.jwt);
         }
         return q;
@@ -1144,7 +1149,7 @@ export class DatabaseConnection {
                 throw Error("item not found!");
             }
         }
-        this._logger.silly("[" + user.username + "][" + collectionname + "] Deleting " + id + " in database");
+        if (Config.log_deletes) this._logger.verbose("[" + user.username + "][" + collectionname + "] Deleting " + id + " in database");
         const res: DeleteWriteOpResultObject = await this.db.collection(collectionname).deleteOne(_query);
     }
 
@@ -1200,10 +1205,11 @@ export class DatabaseConnection {
             for (let i = 0; i < arr.length; i++) {
                 await this._DeleteFile(arr[i]._id);
             }
+            if (Config.log_deletes) this._logger.verbose("[" + user.username + "][" + collectionname + "] deleted " + arr.length + " items in database");
             return arr.length;
         } else {
             const res: DeleteWriteOpResultObject = await this.db.collection(collectionname).deleteMany(_query);
-            this._logger.debug("[" + user.username + "][" + collectionname + "] Deleted " + res.deletedCount + " items in database");
+            if (Config.log_deletes) this._logger.verbose("[" + user.username + "][" + collectionname + "] deleted " + res.deletedCount + " items in database");
             return res.deletedCount;
         }
     }

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.93",
+  "version": "1.1.94",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {

VERSION

@@ -1 +1 @@
-1.1.93
+1.1.94

docker-compose-toolbox.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`toolbox.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.1.93"
+    image: "cloudhack/openflow:1.1.94"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.toolbox.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.93"
+    image: "cloudhack/openflownodered:1.1.94"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik-letsencrypt.yml

@@ -69,7 +69,7 @@ services:
       - "traefik.http.routers.web.entrypoints=web,websecure"
       - "traefik.frontend.passHostHeader=true"
       - "traefik.http.routers.web.tls.certresolver=myresolver"
-    image: "cloudhack/openflow:1.1.93"
+    image: "cloudhack/openflow:1.1.94"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -107,7 +107,7 @@ services:
       - "traefik.http.routers.nodered.entrypoints=web,websecure"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
       - "traefik.http.routers.nodered.tls.certresolver=myresolver"
-    image: "cloudhack/openflownodered:1.1.93"
+    image: "cloudhack/openflownodered:1.1.94"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose-traefik.yml

@@ -45,7 +45,7 @@ services:
       - "traefik.http.routers.web.rule=Host(`localhost.openrpa.dk`)"
       - "traefik.http.routers.web.entrypoints=web"
       - "traefik.frontend.passHostHeader=true"
-    image: "cloudhack/openflow:1.1.93"
+    image: "cloudhack/openflow:1.1.94"
     container_name: "web"
     environment:
       - update_acl_based_on_groups=true
@@ -82,7 +82,7 @@ services:
       - "traefik.http.routers.nodered.rule=Host(`nodered1.localhost.openrpa.dk`)"
       - "traefik.http.routers.nodered.entrypoints=web"
       - "traefik.http.services.nodered.loadbalancer.server.port=1880"
-    image: "cloudhack/openflownodered:1.1.93"
+    image: "cloudhack/openflownodered:1.1.94"
     container_name: "nodered"
     environment:
       #      - nodered_id=1

docker-compose.yml

@@ -18,7 +18,7 @@ services:
       - "5672:5672"
       - "15672:15672"
   web:
-    image: "cloudhack/openflow:1.1.93"
+    image: "cloudhack/openflow:1.1.94"
     environment:
       - update_acl_based_on_groups=true
       - multi_tenant=false
@@ -52,7 +52,7 @@ services:
       - "80:80"
       - "5858:5858"
   nodered:
-    image: "cloudhack/openflownodered:1.1.93"
+    image: "cloudhack/openflownodered:1.1.94"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.1.93",
+  "version": "1.1.94",
   "description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
   "main": "index.js",
   "scripts": {