temp push

Author: skadefro

OpenFlow/src/Config.ts

@@ -24,7 +24,12 @@ export class Config {
         Config.log_updates = Config.parseBoolean(Config.getEnv("log_updates", "false"));
         Config.log_deletes = Config.parseBoolean(Config.getEnv("log_deletes", "false"));
         Config.log_otel_times = Config.parseBoolean(Config.getEnv("log_otel_times", "false"));
+        Config.log_openflow_amqp = Config.parseBoolean(Config.getEnv("log_openflow_amqp", "false"));
         Config.openflow_uniqueid = Config.getEnv("openflow_uniqueid", "");
+        Config.enable_openflow_amqp = Config.parseBoolean(Config.getEnv("enable_openflow_amqp", "false"));
+        Config.openflow_amqp_expiration = parseInt(Config.getEnv("openflow_amqp_expiration", (60 * 1000 * 25).toString())); // 25 min
+        Config.openflow_amqp_processing_limit = parseInt(Config.getEnv("openflow_amqp_processing_limit", "50"));
+
 
         Config.getting_started_url = Config.getEnv("getting_started_url", "");
 
@@ -147,8 +152,11 @@ export class Config {
     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 log_otel_times: boolean = Config.parseBoolean(Config.getEnv("log_otel_times", "false"));
+    public static log_openflow_amqp: boolean = Config.parseBoolean(Config.getEnv("log_openflow_amqp", "false"));
     public static openflow_uniqueid: string = Config.getEnv("openflow_uniqueid", "");
-
+    public static enable_openflow_amqp: boolean = Config.parseBoolean(Config.getEnv("enable_openflow_amqp", "false"));
+    public static openflow_amqp_expiration: number = parseInt(Config.getEnv("openflow_amqp_expiration", (60 * 1000 * 25).toString())); // 25 min
+    public static openflow_amqp_processing_limit: number = parseInt(Config.getEnv("openflow_amqp_processing_limit", "50"));
 
     public static getting_started_url: string = Config.getEnv("getting_started_url", "");
 

OpenFlow/src/DBHelper.ts

@@ -182,7 +182,7 @@ export class DBHelper {
         try {
             let role: Role = await this.FindRoleByNameOrId(name, id, span);
             if (role !== null && (role._id === id || id === null)) { return role; }
-            if (role !== null && !NoderedUtil.IsNullEmpty(role._id)) { await Config.db.DeleteOne(role._id, "users", jwt); }
+            if (role !== null && !NoderedUtil.IsNullEmpty(role._id)) { await Config.db.DeleteOne(role._id, "users", jwt, span); }
             role = new Role(); role.name = name; role._id = id;
             role = await Config.db.InsertOne(role, "users", 0, false, jwt, span);
             role = Role.assign(role);
@@ -203,7 +203,7 @@ export class DBHelper {
         try {
             let user: User = await this.FindByUsernameOrId(username, id, span);
             if (user !== null && (user._id === id || id === null)) { return user; }
-            if (user !== null && id !== null) { await Config.db.DeleteOne(user._id, "users", jwt); }
+            if (user !== null && id !== null) { await Config.db.DeleteOne(user._id, "users", jwt, span); }
             user = new User(); user._id = id; user.name = name; user.username = username;
             if (password !== null && password !== undefined && password !== "") {
                 await Crypt.SetPassword(user, password, span);

OpenFlow/src/DatabaseConnection.ts

@@ -725,7 +725,7 @@ export class LoginProvider {
 
                     const arr = await Config.db.query(q, undefined, 1, 0, { "uploadDate": -1 }, "files", jwt, undefined, undefined, span);
                     if (arr.length > 0) {
-                        await Config.db.DeleteOne(arr[0]._id, "files", jwt);
+                        await Config.db.DeleteOne(arr[0]._id, "files", jwt, span);
                     }
                     res.send({
                         status: "success",