Skip to content

Commit 86535b6

Browse files
committed
Add mq caching
1 parent 38e7e55 commit 86535b6

2 files changed

Lines changed: 19 additions & 7 deletions

File tree

OpenFlow/src/Auth.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export class Auth {
4141
if (type == "grafana") cache_seconds = Config.grafana_credential_cache_seconds;
4242
if (type == "dashboard") cache_seconds = Config.dashboard_credential_cache_seconds;
4343
if (type == "cleanacl") cache_seconds = Config.cleanacl_credential_cache_seconds;
44+
if (type == "mq") cache_seconds = Config.mq_credential_cache_seconds;
4445
if (seconds < cache_seconds) {
4546
Logger.instanse.silly("Return user " + res.user.username + " from cache");
4647
return res.user;
@@ -63,6 +64,7 @@ export class Auth {
6364
if (res.type == "grafana") cache_seconds = Config.grafana_credential_cache_seconds;
6465
if (res.type == "dashboard") cache_seconds = Config.dashboard_credential_cache_seconds;
6566
if (res.type == "cleanacl") cache_seconds = Config.cleanacl_credential_cache_seconds;
67+
if (res.type == "mq") cache_seconds = Config.mq_credential_cache_seconds;
6668
if (seconds >= cache_seconds) {
6769
this.RemoveUser(key, res.type);
6870
}

OpenFlow/src/Config.ts

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,12 @@ export class Config {
6767
Config.tls_ca = Config.getEnv("tls_ca", "");
6868
Config.tls_passphrase = Config.getEnv("tls_passphrase", "");
6969

70-
Config.api_credential_cache_seconds = parseInt(Config.getEnv("api_credential_cache_seconds", "60000"));
71-
Config.api_credential_cache_seconds = parseInt(Config.getEnv("api_credential_cache_seconds", "60000"));
70+
Config.api_credential_cache_seconds = parseInt(Config.getEnv("api_credential_cache_seconds", "900"));
71+
Config.dashboard_credential_cache_seconds = parseInt(Config.getEnv("dashboard_credential_cache_seconds", "900"));
72+
Config.grafana_credential_cache_seconds = parseInt(Config.getEnv("grafana_credential_cache_seconds", "900"));
73+
Config.cleanacl_credential_cache_seconds = parseInt(Config.getEnv("cleanacl_credential_cache_seconds", "900"));
74+
Config.mq_credential_cache_seconds = parseInt(Config.getEnv("mq_credential_cache_seconds", "900"));
75+
7276
Config.oauth_token_cache_seconds = parseInt(Config.getEnv("oauth_token_cache_seconds", "60000"));
7377
Config.oauth_access_token_lifetime = parseInt(Config.getEnv("oauth_access_token_lifetime", "604800"));
7478
Config.oauth_refresh_token_lifetime = parseInt(Config.getEnv("oauth_refresh_token_lifetime", "604800"));
@@ -100,6 +104,9 @@ export class Config {
100104
Config.amqp_force_queue_prefix = Config.parseBoolean(Config.getEnv("amqp_force_queue_prefix", "false"));
101105
Config.amqp_force_exchange_prefix = Config.parseBoolean(Config.getEnv("amqp_force_exchange_prefix", "false"));
102106
Config.amqp_force_sender_has_read = Config.parseBoolean(Config.getEnv("amqp_force_sender_has_read", "true"));
107+
Config.amqp_force_sender_has_invoke = Config.parseBoolean(Config.getEnv("amqp_force_sender_has_invoke", "false"));
108+
Config.amqp_force_consumer_has_update = Config.parseBoolean(Config.getEnv("amqp_force_consumer_has_update", "false"));
109+
103110
Config.amqp_enabled_exchange = Config.parseBoolean(Config.getEnv("amqp_enabled_exchange", "false"));
104111
Config.amqp_url = Config.getEnv("amqp_url", "amqp://localhost"); // used to register queues and by personal nodered
105112
Config.amqp_username = Config.getEnv("amqp_username", "guest"); // used to talk wth rabbitmq api, used if not present in amqp_url
@@ -212,10 +219,12 @@ export class Config {
212219
public static tls_ca: string = Config.getEnv("tls_ca", "");
213220
public static tls_passphrase: string = Config.getEnv("tls_passphrase", "");
214221

215-
public static api_credential_cache_seconds: number = parseInt(Config.getEnv("api_credential_cache_seconds", "60000"));
216-
public static dashboard_credential_cache_seconds: number = parseInt(Config.getEnv("dashboard_credential_cache_seconds", "60000"));
217-
public static grafana_credential_cache_seconds: number = parseInt(Config.getEnv("grafana_credential_cache_seconds", "60000"));
218-
public static cleanacl_credential_cache_seconds: number = parseInt(Config.getEnv("grafana_credential_cache_seconds", "60000"));
222+
public static api_credential_cache_seconds: number = parseInt(Config.getEnv("api_credential_cache_seconds", "900"));
223+
public static dashboard_credential_cache_seconds: number = parseInt(Config.getEnv("dashboard_credential_cache_seconds", "900"));
224+
public static grafana_credential_cache_seconds: number = parseInt(Config.getEnv("grafana_credential_cache_seconds", "900"));
225+
public static cleanacl_credential_cache_seconds: number = parseInt(Config.getEnv("cleanacl_credential_cache_seconds", "900"));
226+
public static mq_credential_cache_seconds: number = parseInt(Config.getEnv("mq_credential_cache_seconds", "900"));
227+
219228
public static oauth_token_cache_seconds: number = parseInt(Config.getEnv("oauth_token_cache_seconds", "60000"));
220229
public static oauth_access_token_lifetime: number = parseInt(Config.getEnv("oauth_access_token_lifetime", "604800"));
221230
public static oauth_refresh_token_lifetime: number = parseInt(Config.getEnv("oauth_refresh_token_lifetime", "604800"));
@@ -252,6 +261,8 @@ export class Config {
252261
public static amqp_force_queue_prefix: boolean = Config.parseBoolean(Config.getEnv("amqp_force_queue_prefix", "false"));
253262
public static amqp_force_exchange_prefix: boolean = Config.parseBoolean(Config.getEnv("amqp_force_exchange_prefix", "false"));
254263
public static amqp_force_sender_has_read: boolean = Config.parseBoolean(Config.getEnv("amqp_force_sender_has_read", "true"));
264+
public static amqp_force_sender_has_invoke: boolean = Config.parseBoolean(Config.getEnv("amqp_force_sender_has_invoke", "true"));
265+
public static amqp_force_consumer_has_update: boolean = Config.parseBoolean(Config.getEnv("amqp_force_consumer_has_update", "false"));
255266
public static amqp_enabled_exchange: boolean = Config.parseBoolean(Config.getEnv("amqp_enabled_exchange", "false"));
256267
public static amqp_url: string = Config.getEnv("amqp_url", "amqp://localhost"); // used to register queues and by personal nodered
257268
public static amqp_username: string = Config.getEnv("amqp_username", "guest"); // used to talk wth rabbitmq api
@@ -261,7 +272,6 @@ export class Config {
261272
public static amqp_check_for_consumer_count: boolean = Config.parseBoolean(Config.getEnv("amqp_check_for_consumer_count", "false"));
262273
public static amqp_default_expiration: number = parseInt(Config.getEnv("amqp_default_expiration", (60 * 1000).toString())); // 1 min
263274
public static amqp_requeue_time: number = parseInt(Config.getEnv("amqp_requeue_time", "1000")); // 1 seconds
264-
// public static amqp_dlx: string = Config.getEnv("amqp_dlx", "openflow-dlx"); // Dead letter exchange, used to pickup dead or timeout messages
265275
public static amqp_dlx: string = Config.getEnv("amqp_dlx", "openflow-dlx"); // Dead letter exchange, used to pickup dead or timeout messages
266276

267277
public static mongodb_url: string = Config.getEnv("mongodb_url", "mongodb://localhost:27017");

0 commit comments

Comments
 (0)