Skip to content

Commit db92b9c

Browse files
skadefroskadefro
authored
Merge pull request openiap#235 from skadefro/master
various fixes
2 parents d5f03c6 + 6dfb168 commit db92b9c

6 files changed

Lines changed: 82 additions & 44 deletions

File tree

‎OpenFlow/src/Config.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export class Config {
3434
Config.log_webserver = Config.parseBoolean(Config.getEnv("log_webserver", "false"));
3535
Config.log_database = Config.parseBoolean(Config.getEnv("log_database", "false"));
3636
Config.log_grafana = Config.parseBoolean(Config.getEnv("log_grafana", "false"));
37+
Config.log_housekeeping = Config.parseBoolean(Config.getEnv("log_housekeeping", "false"));
3738
Config.log_otel = Config.parseBoolean(Config.getEnv("log_otel", "false"));
3839
Config.log_information = Config.parseBoolean(Config.getEnv("log_information", "true"));
3940
Config.log_debug = Config.parseBoolean(Config.getEnv("log_debug", "false"));
@@ -209,7 +210,8 @@ export class Config {
209210

210211
Config.otel_trace_pingclients = Config.parseBoolean(Config.getEnv("otel_trace_pingclients", "false"));
211212
Config.otel_trace_dashboardauth = Config.parseBoolean(Config.getEnv("otel_trace_dashboardauth", "false"));
212-
Config.otel_trace_include_query = Config.parseBoolean(Config.getEnv("otel_trace_include_query", "true"));
213+
Config.otel_trace_include_query = Config.parseBoolean(Config.getEnv("otel_trace_include_query", "false"));
214+
Config.otel_trace_connection_ips = Config.parseBoolean(Config.getEnv("otel_trace_connection_ips", "false"));
213215

214216
Config.validate_user_form = Config.getEnv("validate_user_form", "");
215217
}
@@ -228,6 +230,7 @@ export class Config {
228230
public static log_webserver: boolean = Config.parseBoolean(Config.getEnv("log_webserver", "false"));
229231
public static log_database: boolean = Config.parseBoolean(Config.getEnv("log_database", "false"));
230232
public static log_grafana: boolean = Config.parseBoolean(Config.getEnv("log_grafana", "false"));
233+
public static log_housekeeping: boolean = Config.parseBoolean(Config.getEnv("log_housekeeping", "false"));
231234
public static log_otel: boolean = Config.parseBoolean(Config.getEnv("log_otel", "false"));
232235
public static log_information: boolean = Config.parseBoolean(Config.getEnv("log_information", "true"));
233236
public static log_debug: boolean = Config.parseBoolean(Config.getEnv("log_debug", "false"));
@@ -407,6 +410,7 @@ export class Config {
407410
public static otel_trace_pingclients: boolean = Config.parseBoolean(Config.getEnv("otel_trace_pingclients", "false"));
408411
public static otel_trace_dashboardauth: boolean = Config.parseBoolean(Config.getEnv("otel_trace_dashboardauth", "false"));
409412
public static otel_trace_include_query: boolean = Config.parseBoolean(Config.getEnv("otel_trace_include_query", "false"));
413+
public static otel_trace_connection_ips: boolean = Config.parseBoolean(Config.getEnv("otel_trace_connection_ips", "false"));
410414

411415

412416
public static validate_user_form: string = Config.getEnv("validate_user_form", "");

‎OpenFlow/src/DatabaseConnection.ts‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3616,6 +3616,9 @@ export class DatabaseConnection extends events.EventEmitter {
36163616
if (indexnames.indexOf("_acl") === -1) {
36173617
await this.createIndex(collection.name, "_acl", { "_acl._id": 1, "_acl.rights": 1, "_acl.deny": 1 }, null, span)
36183618
}
3619+
if (indexnames.indexOf("userid_1") === -1) {
3620+
await this.createIndex(collection.name, "userid_1", { "userid": 1 }, null, span)
3621+
}
36193622
break;
36203623
case "users":
36213624
if (indexnames.indexOf("name_1") === -1) {
@@ -3666,12 +3669,12 @@ export class DatabaseConnection extends events.EventEmitter {
36663669
if (indexnames.indexOf("_modified_1") === -1) {
36673670
await this.createIndex(collection.name, "_modified_1", { "_modified": 1 }, null, span)
36683671
}
3669-
// if (indexnames.indexOf("collection_1_timestamp_1") === -1) {
3670-
// await this.createIndex(collection.name, "collection_1_timestamp_1", { _type: 1, "{collection:1,timestamp:1}": 1 }, null, span)
3671-
// }
3672-
// if (indexnames.indexOf("collection_1_timestamp_1_userid_1") === -1) {
3673-
// await this.createIndex(collection.name, "collection_1_timestamp_1_userid_1", { _type: 1, "{collection:1,timestamp:1,userid:1}": 1 }, null, span)
3674-
// }
3672+
if (indexnames.indexOf("collection_1_timestamp_1_userid_1") === -1) {
3673+
await this.createIndex(collection.name, "collection_1_timestamp_1_userid_1", { _type: 1, "{collection:1,timestamp:1,userid:1}": 1 }, null, span)
3674+
}
3675+
if (indexnames.indexOf("timestamp_1_userid_1") === -1) {
3676+
await this.createIndex(collection.name, "timestamp_1_userid_1", { _type: 1, "{timestamp:1,userid:1}": 1 }, null, span)
3677+
}
36753678
if (indexnames.indexOf("timestamp_1") === -1) {
36763679
await this.createIndex(collection.name, "timestamp_1", { _type: 1, "{timestamp:1}": 1 }, null, span)
36773680
}

‎OpenFlow/src/Logger.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ export class Logger {
152152
if (Config.log_webserver) Logger.enabled["WebServer"] = level.Verbose;
153153
if (Config.log_database) Logger.enabled["DatabaseConnection"] = level.Verbose;
154154
if (Config.log_grafana) Logger.enabled["grafana-proxy"] = level.Verbose;
155+
if (Config.log_housekeeping) Logger.enabled["Housekeeping"] = level.Verbose;
155156
if (Config.log_otel) Logger.enabled["otel"] = level.Verbose;
156157

157158

0 commit comments

Comments
 (0)