mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-11 12:57:29 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: Initialize license in queue mode correctly (#6301)

Browse source
This commit is contained in:
Omar Ajoue 2023-05-23 13:01:50 +02:00 committed by GitHub
parent 55b755cb44
commit 42c79cd6f1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/cli/src/License.ts
View file

@ -98,6 +98,7 @@ export class License {
isFeatureEnabled(feature: string): boolean {
if (!this.manager) {
getLogger().warn('License manager not initialized');
return false;
}

23
packages/cli/src/commands/BaseCommand.ts
View file

@ -19,6 +19,7 @@ import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
import type { IExternalHooksClass } from '@/Interfaces';
import { InternalHooks } from '@/InternalHooks';
import { PostHogClient } from '@/posthog';
import { License } from '@/License';
export const UM_FIX_INSTRUCTION =
'Please fix the database by running ./packages/cli/bin/n8n user-management:reset';
@ -119,6 +120,28 @@ export abstract class BaseCommand extends Command {
await this.externalHooks.init();
}
async initLicense(): Promise<void> {
const license = Container.get(License);
await license.init(this.instanceId);
const activationKey = config.getEnv('license.activationKey');
if (activationKey) {
const hasCert = (await license.loadCertStr()).length > 0;
if (hasCert) {
return LoggerProxy.debug('Skipping license activation');
}
try {
LoggerProxy.debug('Attempting license activation');
await license.activate(activationKey);
} catch (e) {
LoggerProxy.error('Could not activate license', e as Error);
}
}
}
async finally(error: Error | undefined) {
if (inTest || this.id === 'start') return;
if (Db.connectionState.connected) {

23
packages/cli/src/commands/start.ts
View file

@ -28,7 +28,6 @@ import { EDITOR_UI_DIST_DIR, GENERATED_STATIC_DIR } from '@/constants';
import { eventBus } from '@/eventbus';
import { BaseCommand } from './BaseCommand';
import { InternalHooks } from '@/InternalHooks';
import { License } from '@/License';
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
const open = require('open');
@ -186,28 +185,6 @@ export class Start extends BaseCommand {
await Promise.all(files.map(compileFile));
}
async initLicense(): Promise<void> {
const license = Container.get(License);
await license.init(this.instanceId);
const activationKey = config.getEnv('license.activationKey');
if (activationKey) {
const hasCert = (await license.loadCertStr()).length > 0;
if (hasCert) {
return LoggerProxy.debug('Skipping license activation');
}
try {
LoggerProxy.debug('Attempting license activation');
await license.activate(activationKey);
} catch (e) {
LoggerProxy.error('Could not activate license', e as Error);
}
}
}
async init() {
await this.initCrashJournal();

1
packages/cli/src/commands/webhook.ts
View file

@ -77,6 +77,7 @@ export class Webhook extends BaseCommand {
await this.initCrashJournal();
await super.init();
await this.initLicense();
await this.initBinaryManager();
await this.initExternalHooks();
}

1
packages/cli/src/commands/worker.ts
View file

@ -224,6 +224,7 @@ export class Worker extends BaseCommand {
await super.init();
this.logger.debug('Starting n8n worker...');
await this.initLicense();
await this.initBinaryManager();
await this.initExternalHooks();
}