[WIP]

jongpie · Sep 20, 2024 · befeb37 · befeb37
1 parent 8a6a54d
commit befeb37
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/nebula-logger/core/main/logger-engine/lwc/logger/__tests__/logger.test.js b/nebula-logger/core/main/logger-engine/lwc/logger/__tests__/logger.test.js
@@ -1,7 +1,7 @@
 import { createElement } from 'lwc';
 import FORM_FACTOR from '@salesforce/client/formFactor';
 // Recommended approach
-import { createLogger } from 'c/logger';
+import { createLogger, getLogger } from 'c/logger';
 // Legacy approach
 import Logger from 'c/logger';
 import getSettings from '@salesforce/apex/ComponentLogger.getSettings';
@@ -44,6 +44,7 @@ describe('logger lwc import tests', () => {
 
   it('sets a log scenario on all entries when using recommended import approach', async () => {
     getSettings.mockResolvedValue({ ...MOCK_GET_SETTINGS });
+    // const logger = getLogger();
     const logger = await createLogger();
     const scenario = 'some scenario';
     const message = 'some message';
@@ -141,7 +142,6 @@ describe('logger lwc import tests', () => {
 
     const logEntry = logger.finest(message).getComponentLogEntry();
 
-    await flushPromises();
     expect(logger.getBufferSize()).toEqual(1);
     expect(logEntry.loggingLevel).toEqual('FINEST');
     expect(logEntry.message).toEqual(message);

diff --git a/nebula-logger/core/main/logger-engine/lwc/logger/loggerService.js b/nebula-logger/core/main/logger-engine/lwc/logger/loggerService.js
@@ -129,10 +129,12 @@ const LoggerService = class {
   _newEntry(loggingLevel, message, originStackTraceError) {
     originStackTraceError = originStackTraceError ?? new Error();
     const logEntryBuilder = newLogEntry(loggingLevel).parseStackTrace(originStackTraceError).setMessage(message).setScenario(this.#scenario);
+    const logEntry = logEntryBuilder.getComponentLogEntry();
+    logEntry.scenario = this.#scenario;
 
     const loggingLevelCheckTask = providedLoggingLevel => {
       if (this._meetsUserLoggingLevel(providedLoggingLevel)) {
-        this.#componentLogEntries.push(logEntryBuilder.getComponentLogEntry());
+        this.#componentLogEntries.push(logEntry);
 
         if (this.#settings.isConsoleLoggingEnabled) {
           logEntryBuilder.logToConsole();
@@ -143,6 +145,7 @@ const LoggerService = class {
       }
     };
     this.#taskQueue.enqueueTask(loggingLevelCheckTask, loggingLevel);
+    this.#taskQueue.processTaskQueue();
 
     return logEntryBuilder;
   }
@@ -159,7 +162,10 @@ const getLoggerService = function () {
 };
 
 const createLoggerService = async function () {
-  return Promise.resolve(getLoggerService());
+  const service = new LoggerService();
+  await service._loadSettingsFromServer();
+  await Promise.resolve();
+  return service;
 };
 
 export { createLoggerService, getLoggerService };