mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/cli/src/environments/sourceControl/sourceControlPreferences.service.ee.ts
View File

@@ -10,7 +10,7 @@ import {
sourceControlFoldersExistCheck,
} from './sourceControlHelper.ee';
import { InstanceSettings } from 'n8n-core';
import { LoggerProxy, jsonParse } from 'n8n-workflow';
import { jsonParse } from 'n8n-workflow';
import * as Db from '@/Db';
import {
SOURCE_CONTROL_SSH_FOLDER,
@@ -21,6 +21,7 @@ import {
import path from 'path';
import type { KeyPairType } from './types/keyPairType';
import config from '@/config';
import { Logger } from '@/Logger';
@Service()
export class SourceControlPreferencesService {
@@ -32,7 +33,10 @@ export class SourceControlPreferencesService {
readonly gitFolder: string;
constructor(instanceSettings: InstanceSettings) {
constructor(
instanceSettings: InstanceSettings,
private readonly logger: Logger,
) {
this.sshFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_SSH_FOLDER);
this.gitFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
this.sshKeyName = path.join(this.sshFolder, SOURCE_CONTROL_SSH_KEY_NAME);
@@ -66,7 +70,7 @@ export class SourceControlPreferencesService {
try {
return fsReadFileSync(this.sshKeyName + '.pub', { encoding: 'utf8' });
} catch (error) {
LoggerProxy.error(`Failed to read public key: ${(error as Error).message}`);
this.logger.error(`Failed to read public key: ${(error as Error).message}`);
}
return '';
}
@@ -79,7 +83,7 @@ export class SourceControlPreferencesService {
try {
await fsRm(this.sshFolder, { recursive: true });
} catch (error) {
LoggerProxy.error(`Failed to delete ssh folder: ${(error as Error).message}`);
this.logger.error(`Failed to delete ssh folder: ${(error as Error).message}`);
}
}
@@ -160,7 +164,7 @@ export class SourceControlPreferencesService {
const keyPairType =
preferences.keyGeneratorType ??
(config.get('sourceControl.defaultKeyPairType') as KeyPairType);
LoggerProxy.debug(`No key pair files found, generating new pair using type: ${keyPairType}`);
this.logger.debug(`No key pair files found, generating new pair using type: ${keyPairType}`);
await this.generateAndSaveKeyPair(keyPairType);
}
this.sourceControlPreferences = preferences;
@@ -194,7 +198,7 @@ export class SourceControlPreferencesService {
return preferences;
}
} catch (error) {
LoggerProxy.warn(
this.logger.warn(
`Could not parse Source Control settings from database: ${(error as Error).message}`,
);
}