refactor(core): Make Logger a service (no-changelog) (#7494)

This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2023-10-25 16:35:22 +02:00
committed by GitHub
parent db4e61ba24
commit 05586a900d
131 changed files with 761 additions and 919 deletions

View File

@@ -8,7 +8,7 @@ import type {
import { Cipher } from 'n8n-core';
import Container, { Service } from 'typedi';
import { getLogger } from '@/Logger';
import { Logger } from '@/Logger';
import { jsonParse, type IDataObject } from 'n8n-workflow';
import {
@@ -21,8 +21,6 @@ import { InternalHooks } from '@/InternalHooks';
import { ExternalSecretsProviders } from './ExternalSecretsProviders.ee';
import { OrchestrationMainService } from '@/services/orchestration/main/orchestration.main.service';
const logger = getLogger();
@Service()
export class ExternalSecretsManager {
private providers: Record<string, SecretsProvider> = {};
@@ -38,10 +36,11 @@ export class ExternalSecretsManager {
initRetryTimeouts: Record<string, NodeJS.Timer> = {};
constructor(
private settingsRepo: SettingsRepository,
private license: License,
private secretsProviders: ExternalSecretsProviders,
private cipher: Cipher,
private readonly logger: Logger,
private readonly settingsRepo: SettingsRepository,
private readonly license: License,
private readonly secretsProviders: ExternalSecretsProviders,
private readonly cipher: Cipher,
) {}
async init(): Promise<void> {
@@ -72,7 +71,7 @@ export class ExternalSecretsManager {
}
async reloadAllProviders(backoff?: number) {
logger.debug('Reloading all external secrets providers');
this.logger.debug('Reloading all external secrets providers');
const providers = this.getProviderNames();
if (!providers) {
return;
@@ -140,7 +139,7 @@ export class ExternalSecretsManager {
try {
await provider.init(providerSettings);
} catch (e) {
logger.error(
this.logger.error(
`Error initializing secrets provider ${provider.displayName} (${provider.name}).`,
);
this.retryInitWithBackoff(name, currentBackoff);
@@ -155,7 +154,7 @@ export class ExternalSecretsManager {
try {
await provider.disconnect();
} catch {}
logger.error(
this.logger.error(
`Error initializing secrets provider ${provider.displayName} (${provider.name}).`,
);
this.retryInitWithBackoff(name, currentBackoff);
@@ -190,7 +189,7 @@ export class ExternalSecretsManager {
await p.update();
}
} catch {
logger.error(`Error updating secrets provider ${p.displayName} (${p.name}).`);
this.logger.error(`Error updating secrets provider ${p.displayName} (${p.name}).`);
}
}),
);