Skip to content

Commit d5cadc3

Browse files
skadefroskadefro
committed
bump
1 parent e801ed6 commit d5cadc3

17 files changed

Lines changed: 20 additions & 105 deletions

‎OpenFlow/src/Messages/Message.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -858,15 +858,12 @@ export class Message {
858858
AccessToken = await OAuthProvider.instance.oidc.AccessToken.find(msg.rawAssertion);
859859
if (!NoderedUtil.IsNullUndefinded(AccessToken)) {
860860
User = await OAuthProvider.instance.oidc.Account.findAccount(null, AccessToken.accountId);
861-
console.log('User:', User);
862861
}
863-
console.log('AccessToken:', AccessToken);
864862
} catch (error) {
865863
console.error(error);
866864
}
867865
if (!NoderedUtil.IsNullUndefinded(AccessToken)) {
868866
user = User.user;
869-
console.log('User:', user);
870867
if (user !== null && user != undefined) { tuser = TokenUser.From(user); }
871868
} else {
872869
type = "samltoken";
@@ -1044,7 +1041,6 @@ export class Message {
10441041
cli._logger.error(error);
10451042
}
10461043
hrend = process.hrtime(hrstart)
1047-
console.log(`[Signin Completed] Execution time:${(hrend[0] * 1000000000 + hrend[1]) / 1000000} ms`)
10481044
} catch (error) {
10491045
span.recordException(error);
10501046
}

‎OpenFlow/src/OAuthProvider.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,6 @@ export class OAuthProvider {
109109
// cli.grant_types = cli.grants;
110110
// if (cli.grant_types == null) cli.grant_types = ['authorization_code'];
111111
if (cli.grant_types == null) cli.grant_types = ['implicit', 'authorization_code'];
112-
console.log(cli.clientId + " " + cli.token_endpoint_auth_method);
113-
114-
115112
// cli.redirect_uris.push("https://localhost.openiap.io/")
116113
});
117114
const provider = new Provider(Config.baseurl() + "oidc", {
@@ -177,7 +174,6 @@ export class OAuthProvider {
177174
if (message === 'redirect_uris must contain members') {
178175
return;
179176
}
180-
console.log(code + " " + message);
181177
orig.call(this, message);
182178
};
183179
const orgpostLogoutRedirectUriAllowed = provider.Client.prototype.postLogoutRedirectUriAllowed;
@@ -252,7 +248,6 @@ export class OAuthProvider {
252248
var r = req;
253249
var u = req.user;
254250
const isAuthenticated: boolean = req.isAuthenticated();
255-
console.log("isAuthenticated: " + isAuthenticated)
256251
if (isAuthenticated) {
257252
// if(!NoderedUtil.IsNullEmpty(test.returnTo) ) {
258253
// res.redirect(test.returnTo);

‎OpenFlow/src/WebSocketServer.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export class WebSocketServer {
2121
public static websocket_queue_count: BaseObserver;
2222
public static websocket_queue_message_count: Counter;
2323
public static websocket_rate_limit: Counter;
24-
public static webserver_rate_limit: Counter;
2524
public static websocket_messages: ValueRecorder;
2625
public static message_queue_count: BaseObserver;
2726
public static mongodb_watch_count: BaseObserver;
@@ -67,9 +66,6 @@ export class WebSocketServer {
6766
WebSocketServer.websocket_rate_limit = _otel.meter.createCounter("openflow_websocket_rate_limit_count", {
6867
description: 'Total number of rate limited messages'
6968
}) // "command"
70-
WebSocketServer.webserver_rate_limit = _otel.meter.createCounter("openflow_webserver_rate_limit_count", {
71-
description: 'Total number of rate limited messages'
72-
}) // "command"
7369
WebSocketServer.websocket_messages = _otel.meter.createValueRecorder('openflow_websocket_messages_duration_seconds', {
7470
description: 'Duration for handling websocket requests',
7571
boundaries: otel.default_boundaries
@@ -143,7 +139,7 @@ export class WebSocketServer {
143139
if (cli.user != null) {
144140
if (!NoderedUtil.IsNullEmpty(cli.clientagent)) {
145141
if (!NoderedUtil.IsNullUndefinded(WebSocketServer.p_all)) {
146-
if(NoderedUtil.IsNullUndefinded(p_all[cli.clientagent])) p_all[cli.clientagent] = 0;
142+
if (NoderedUtil.IsNullUndefinded(p_all[cli.clientagent])) p_all[cli.clientagent] = 0;
147143
p_all[cli.clientagent] += 1;
148144
}
149145
}

‎OpenFlow/src/WebSocketServerClient.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ export class WebSocketServerClient {
233233
ack(false);
234234
// ack(); // just eat the error
235235
done(_data);
236-
console.log(qname + " failed message queue message, nack and re queue message: ", (error.message ? error.message : error));
236+
console.error(qname + " failed message queue message, nack and re queue message: ", (error.message ? error.message : error));
237237
}, Config.amqp_requeue_time);
238238
}
239239
});
@@ -457,7 +457,7 @@ export class WebSocketServerClient {
457457
const me = this;
458458
try {
459459
(stream.stream as any).on("error", err => {
460-
console.log(err);
460+
console.error(err);
461461
});
462462
(stream.stream as any).on("change", next => {
463463
try {

‎OpenFlow/src/public/CommonControllers.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ export class translate implements ng.IDirective {
158158
if (result == "%%KEY_NOT_FOUND%%" || result == "") {
159159
if (global_translate_notfound.indexOf(lib + "." + value) === -1) {
160160
global_translate_notfound.push(lib + "." + value);
161-
console.log("KEY_NOT_FOUND " + lib + "." + value);
161+
console.debug("KEY_NOT_FOUND " + lib + "." + value);
162162
}
163163
result = value;
164164
}
@@ -336,10 +336,8 @@ export class entitiesCtrl<T> {
336336
const end = errIdx + context >= txt.length
337337
? txt.length
338338
: errIdx + context
339-
e.message += ` while parsing near "${
340-
start === 0 ? "" : "..."
341-
}${txt.slice(start, end)}${
342-
end === txt.length ? "" : "..."
339+
e.message += ` while parsing near "${start === 0 ? "" : "..."
340+
}${txt.slice(start, end)}${end === txt.length ? "" : "..."
343341
}"`
344342
} else {
345343
e.message += ` while parsing "${txt.slice(0, context * 2)}"`
@@ -349,7 +347,7 @@ export class entitiesCtrl<T> {
349347
}
350348
async loadData(): Promise<void> {
351349
try {
352-
if (this.loading == true) { console.log("allready loading data, exit"); return; }
350+
if (this.loading == true) { console.debug("allready loading data, exit"); return; }
353351
this.errormessage = "";
354352
this.loading = true;
355353
if (this.preloadData != null) {
@@ -496,7 +494,7 @@ export class entityCtrl<T> {
496494
}
497495
async loadData(): Promise<void> {
498496
try {
499-
if (this.loading == true) { console.log("allready loading data, exit"); return; }
497+
if (this.loading == true) { console.debug("allready loading data, exit"); return; }
500498
this.errormessage = "";
501499
let updated: boolean = false;
502500
this.loading = true;

0 commit comments

Comments
 (0)