Skip to content

Commit 5fb2b28

Browse files
Fix logger (correct reacting on envvars)
1 parent 94a909f commit 5fb2b28

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

application/client/src/app/ui/elements/tree/component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ export class ElementsTreeSelector
182182
if (entity.isFolder()) {
183183
return;
184184
}
185-
// TODO: Needs implementation >>>>>>>>>>>>>>>>>>>>>>>
185+
// TODO: Needs implementation
186186
// this.ilc()
187187
// .services.system.opener.text(entity.getPath())
188188
// .auto()

application/holder/src/env/logs/index.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ const store = new FileStore();
88

99
export function setLogLevelFromEnvvars(): void {
1010
const level = (() => {
11-
if (envvars.get().CHIPMUNK_DEVELOPING_MODE === true) {
11+
const level = utils.getLogLevelFromStr(envvars.get().CHIPMUNK_DEV_LOGLEVEL);
12+
if (envvars.get().CHIPMUNK_DEVELOPING_MODE === true && level === undefined) {
1213
return Level.VERBOS;
14+
} else if (level !== undefined) {
15+
return level;
16+
} else {
17+
return Level.DEBUG;
1318
}
14-
const devLevel = utils.getLogLevelFromStr(envvars.get().CHIPMUNK_DEV_LOGLEVEL);
15-
if (devLevel !== undefined) {
16-
return devLevel;
17-
}
18-
return Level.DEBUG;
1919
})();
2020
state.setLevel(level);
2121
}

application/holder/src/service/bridge.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ export class Service extends Implementation {
177177
if (this.logger === undefined) {
178178
this.logger = new Logger('CLIENT');
179179
}
180-
Logger.post(`[C]${event.message}`, event.level);
180+
this.logger.publish(`[C]${event.message}`, event.level);
181181
this.logger.store(`[C]${event.message}`, event.level);
182182
}),
183183
);

application/platform/log/logger.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export abstract class Logger {
163163
});
164164
}
165165

166-
protected publish(msg: string, level: Level): Logger {
166+
public publish(msg: string, level: Level): Logger {
167167
const defaultsLoggerInUse =
168168
typeof (this as any).isDefault === 'function' ? (this as any).isDefault() : false;
169169
if (defaultsLoggerInUse) {

application/platform/log/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export function getLogLevelFromStr(str: any): Level | undefined {
1717
if (getProp(LOGS_LEVEL_TABLE, str) === undefined) {
1818
return undefined;
1919
}
20-
return getProp(LOGS_LEVEL_TABLE, str) as Level;
20+
return str as Level;
2121
}
2222

2323
export function strToLogLevel(level: string): Level {

0 commit comments

Comments
 (0)