Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Replace logging with external library

Browse Source
This commit is contained in:
Joachim Van Herwegen
2024-08-29 09:25:29 +02:00
parent 3902eccbde
commit 7c98751aa2
176 changed files with 201 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/unit/init/BaseUrlVerifier.test.ts
View File

@@ -1,9 +1,9 @@
import { getLoggerFor } from 'global-logger-factory';
import type { Logger } from 'global-logger-factory';
import { BaseUrlVerifier } from '../../../src/init/BaseUrlVerifier';
import type { Logger } from '../../../src/logging/Logger';
import { getLoggerFor } from '../../../src/logging/LogUtil';
import type { KeyValueStorage } from '../../../src/storage/keyvalue/KeyValueStorage';
jest.mock('../../../src/logging/LogUtil', (): any => {
jest.mock('global-logger-factory', (): any => {
const logger: Logger = { warn: jest.fn() } as any;
return { getLoggerFor: (): Logger => logger };
});

6
test/unit/init/ContainerInitializer.test.ts
View File

@@ -1,11 +1,11 @@
import { getLoggerFor } from 'global-logger-factory';
import type { Logger } from 'global-logger-factory';
import { ContainerInitializer } from '../../../src/init/ContainerInitializer';
import type { Logger } from '../../../src/logging/Logger';
import { getLoggerFor } from '../../../src/logging/LogUtil';
import type { Resource, ResourcesGenerator } from '../../../src/pods/generate/ResourcesGenerator';
import type { KeyValueStorage } from '../../../src/storage/keyvalue/KeyValueStorage';
import type { ResourceStore } from '../../../src/storage/ResourceStore';
jest.mock('../../../src/logging/LogUtil', (): any => {
jest.mock('global-logger-factory', (): any => {
const logger: Logger = { warn: jest.fn(), debug: jest.fn(), info: jest.fn() } as any;
return { getLoggerFor: (): Logger => logger };
});

6
test/unit/init/LoggerInitializer.test.ts
View File

@@ -1,8 +1,8 @@
import type { LoggerFactory } from 'global-logger-factory';
import { setGlobalLoggerFactory } from 'global-logger-factory';
import { LoggerInitializer } from '../../../src/init/LoggerInitializer';
import type { LoggerFactory } from '../../../src/logging/LoggerFactory';
import { setGlobalLoggerFactory } from '../../../src/logging/LogUtil';
jest.mock('../../../src/logging/LogUtil');
jest.mock('global-logger-factory');
describe('LoggerInitializer', (): void => {
const loggerFactory = {} as LoggerFactory;

6
test/unit/init/ServerInitializer.test.ts
View File

@@ -1,13 +1,13 @@
import type { Server } from 'node:http';
import { Server as HttpsServer } from 'node:https';
import { getLoggerFor } from 'global-logger-factory';
import type { Logger } from 'global-logger-factory';
import { ServerInitializer } from '../../../src/init/ServerInitializer';
import type { Logger } from '../../../src/logging/Logger';
import { getLoggerFor } from '../../../src/logging/LogUtil';
import type { HttpServerFactory } from '../../../src/server/HttpServerFactory';
// Mock so we don't create an actual HTTPS server in the test below
jest.mock('node:https');
jest.mock('../../../src/logging/LogUtil');
jest.mock('global-logger-factory');
describe('ServerInitializer', (): void => {
let logger: jest.Mocked<Logger>;

5
test/unit/init/cluster/ClusterManager.test.ts
View File

@@ -1,14 +1,15 @@
import cluster from 'node:cluster';
import EventEmitter from 'node:events';
import { cpus } from 'node:os';
import * as glf from 'global-logger-factory';
import { ClusterManager } from '../../../../src';
import * as LogUtil from '../../../../src/logging/LogUtil';
jest.mock('node:cluster');
jest.mock('node:os', (): any => ({
...jest.requireActual('node:os'),
cpus: jest.fn().mockImplementation((): any => [{}, {}, {}, {}, {}, {}]),
}));
jest.mock('global-logger-factory');
const mockWorker = new EventEmitter() as any;
mockWorker.process = { pid: 666 };
@@ -17,7 +18,7 @@ describe('A ClusterManager', (): void => {
const emitter = new EventEmitter();
const mockCluster = jest.requireMock('node:cluster');
const mockLogger = { info: jest.fn(), warn: jest.fn() };
jest.spyOn(LogUtil, 'getLoggerFor').mockImplementation((): any => mockLogger);
jest.spyOn(glf, 'getLoggerFor').mockImplementation((): any => mockLogger);
beforeAll((): void => {
Object.assign(mockCluster, {