turn down logging

Author: skadefro

OpenFlow/src/DatabaseConnection.ts

@@ -639,7 +639,7 @@ export class DatabaseConnection {
         if ((hasUser === null || hasUser === undefined)) {
             Base.addRight(item, user._id, user.name, [Rights.full_control]);
         }
-        if (collectionname != "audit") { this._logger.debug("[" + user.username + "][" + collectionname + "] Adding " + item._type + " " + name + " to database"); }
+        if (collectionname != "audit") { this._logger.silly("[" + user.username + "][" + collectionname + "] Adding " + item._type + " " + name + " to database"); }
         if (!this.hasAuthorization(user, item, Rights.create)) { throw new Error("Access denied, no authorization to InsertOne " + item._type + " " + name + " to database"); }
 
         item = this.encryptentity(item) as T;
@@ -1012,7 +1012,7 @@ export class DatabaseConnection {
         (q.item["$set"])._modified = new Date(new Date().toISOString());
 
 
-        this._logger.debug("[" + user.username + "][" + q.collectionname + "] UpdateMany " + (q.item.name || q.item._name) + " in database");
+        this._logger.silly("[" + user.username + "][" + q.collectionname + "] UpdateMany " + (q.item.name || q.item._name) + " in database");
 
         q.j = ((q.j as any) === 'true' || q.j === true);
         if ((q.w as any) !== "majority") q.w = parseInt((q.w as any));
@@ -1078,15 +1078,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.debug("[" + user.username + "][" + q.collectionname + "] InsertOrUpdateOne, Updating found one in database");
+            this._logger.silly("[" + 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.debug("[" + user.username + "][" + q.collectionname + "] InsertOrUpdateOne, Inserting as new in database");
+            this._logger.silly("[" + 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;
@@ -1116,16 +1116,11 @@ export class DatabaseConnection {
         if (id === null || id === undefined || id === "") { throw Error("id cannot be null"); }
         await this.connect();
         const user: TokenUser = Crypt.verityToken(jwt);
-        // const original:Base = await this.getbyid(id, collectionname, jwt);
-        // if(!original) { throw Error("item not found!"); }
-        // if(!this.hasAuthorization(user, original, "delete")) { throw new Error("Access denied, no authorization to DeleteOne"); }
         let _query: any = {};
         if (typeof id === 'string' || id instanceof String) {
             _query = { $and: [{ _id: id }, this.getbasequery(jwt, "_acl", [Rights.delete])] };
-            //_query = { $and: [{ _id: { $ne: user._id } }, _query] };
         } else {
             _query = { $and: [{ id }, this.getbasequery(jwt, "_acl", [Rights.delete])] };
-            //_query = { $and: [{ _id: { $ne: user._id } }, _query] };
         }
 
         if (collectionname === "files") { collectionname = "fs.files"; }
@@ -1139,29 +1134,8 @@ export class DatabaseConnection {
                 throw Error("item not found!");
             }
         }
-
-
-        // const arr = await this.db.collection(collectionname).find(_query).toArray();
-
-        this._logger.debug("[" + user.username + "][" + collectionname + "] Deleting " + id + " in database");
+        this._logger.silly("[" + user.username + "][" + collectionname + "] Deleting " + id + " in database");
         const res: DeleteWriteOpResultObject = await this.db.collection(collectionname).deleteOne(_query);
-
-        // const res:DeleteWriteOpResultObject = await this.db.collection(collectionname).deleteOne({_id:id});
-        // const res:DeleteWriteOpResultObject = await this.db.collection(collectionname).deleteOne(id);
-        if (res.deletedCount === 0) { throw Error("item not found!"); } else {
-            // try {
-            //     const item: any = { _id: id, };
-            //     item._modifiedby = user.name;
-            //     item._modifiedbyid = user._id;
-            //     item._modified = new Date(new Date().toISOString());
-            //     item._deletedby = user.name;
-            //     item._deletedbyid = user._id;
-            //     item._deleted = new Date(new Date().toISOString());
-            //     await this.SaveDiff(collectionname, null, item);
-            // } catch (error) {
-            //     console.error(error)
-            // }
-        }
     }
 
     /**

OpenFlowNodeRED/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflow-nodered",
-  "version": "1.1.70",
+  "version": "1.1.71",
   "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.70
+1.1.71

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.70"
+    image: "cloudhack/openflow:1.1.71"
     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.70"
+    image: "cloudhack/openflownodered:1.1.71"
     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.70"
+    image: "cloudhack/openflow:1.1.71"
     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.70"
+    image: "cloudhack/openflownodered:1.1.71"
     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.70"
+    image: "cloudhack/openflow:1.1.71"
     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.70"
+    image: "cloudhack/openflownodered:1.1.71"
     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.70"
+    image: "cloudhack/openflow:1.1.71"
     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.70"
+    image: "cloudhack/openflownodered:1.1.71"
     environment:
       #      - nodered_id=1
       - nodered_sa=nodered1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openiap",
-  "version": "1.1.70",
+  "version": "1.1.71",
   "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": {