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

refactor(core): Load dotenv as early as possible (no-changelog) (#10948)

Browse source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2024-09-25 12:37:51 +02:00 committed by GitHub
parent 5ce05b33d2
commit afbe884dad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
packages/cli/bin/n8n
View file

@ -43,6 +43,13 @@ require('express-async-errors');
require('source-map-support').install(); require('source-map-support').install();
require('reflect-metadata'); require('reflect-metadata');
// Skip loading dotenv in e2e tests.
// Also, do not use `inE2ETests` from constants here, because that'd end up code that might read from `process.env` before the values are loaded from an `.env` file.
if (process.env.E2E_TESTS !== 'true') {
// Loading dotenv early ensures that `process.env` is up-to-date everywhere in code
require('dotenv').config();
}
if (process.env.NODEJS_PREFER_IPV4 === 'true') { if (process.env.NODEJS_PREFER_IPV4 === 'true') {
require('dns').setDefaultResultOrder('ipv4first'); require('dns').setDefaultResultOrder('ipv4first');
} }

3
packages/cli/src/config/index.ts
View file

@ -1,6 +1,5 @@
import { GlobalConfig } from '@n8n/config'; import { GlobalConfig } from '@n8n/config';
import convict from 'convict'; import convict from 'convict';
import dotenv from 'dotenv';
import { flatten } from 'flat'; import { flatten } from 'flat';
import { readFileSync } from 'fs'; import { readFileSync } from 'fs';
import merge from 'lodash/merge'; import merge from 'lodash/merge';
@ -22,8 +21,6 @@ if (inE2ETests) {
process.env.N8N_PUBLIC_API_DISABLED = 'true'; process.env.N8N_PUBLIC_API_DISABLED = 'true';
process.env.SKIP_STATISTICS_EVENTS = 'true'; process.env.SKIP_STATISTICS_EVENTS = 'true';
process.env.N8N_SECURE_COOKIE = 'false'; process.env.N8N_SECURE_COOKIE = 'false';
} else {
dotenv.config();
} }
// Load schema after process.env has been overwritten // Load schema after process.env has been overwritten