Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Support environment variable for config 🚀 #489

Merged
merged 8 commits into from
Jun 11, 2023
Merged

feat: Support environment variable for config 🚀 #489

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b6b094
:rocket: Support environment variable for config
Zheaoli Jun 1, 2023
9cb33b0
update code
Zheaoli Jun 1, 2023
c4e53ec
update code
Zheaoli Jun 1, 2023
6dcc847
update code
Zheaoli Jun 1, 2023
9a73102
Update config.default.ts
fengmk2 Jun 11, 2023
dfa2ef8
Update config.default.ts
fengmk2 Jun 11, 2023
496f161
Update config.default.ts
fengmk2 Jun 11, 2023
e22619d
Update config.default.ts
fengmk2 Jun 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
33 changes: 22 additions & 11 deletions config/config.default.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,25 +60,25 @@
config.cnpmcore = cnpmcoreConfig;

// override config from framework / plugin
config.dataDir = join(appInfo.root, '.cnpmcore');
config.dataDir = process.env.CNPMCORE_DATA_DIR || join(appInfo.root, '.cnpmcore');

config.orm = {
client: 'mysql',
database: process.env.MYSQL_DATABASE || 'cnpmcore',
host: process.env.MYSQL_HOST || '127.0.0.1',
port: process.env.MYSQL_PORT || 3306,
user: process.env.MYSQL_USER || 'root',
password: process.env.MYSQL_PASSWORD,
database: process.env.CNPMCORE_MYSQL_DATABASE || process.env.MYSQL_DATABASE || 'cnpmcore',
host: process.env.CNPMCORE_MYSQL_HOST || process.env.MYSQL_HOST || '127.0.0.1',
port: process.env.CNPMCORE_MYSQL_PORT || process.env.MYSQL_PORT || 3306,
user: process.env.CNPMCORE_MYSQL_USER || process.env.MYSQL_USER || 'root',
password: process.env.CNPMCORE_MYSQL_PASSWORD || process.env.MYSQL_PASSWORD,
charset: 'utf8mb4',
logger: {},
};

config.redis = {
client: {
port: 6379,
host: '127.0.0.1',
password: '',
db: 0,
port: Number(process.env.CNPMCORE_REDIS_PORT || 6379),
host: process.env.CNPMCORE_REDIS_HOST || '127.0.0.1',
password: process.env.CNPMCORE_REDIS_PASSWORD || '',
db: Number(process.env.CNPMCORE_REDIS_DB || 0),
},
};

Expand All @@ -98,7 +98,7 @@

config.nfs = {
client: null,
dir: join(config.dataDir, 'nfs'),
dir: process.env.CNPMCORE_NFS_DIR || join(config.dataDir, 'nfs'),
};
/* c8 ignore next 17 */
// enable oss nfs store by env values
Expand All @@ -122,7 +122,18 @@
config.logger = {
enablePerformanceTimer: true,
enableFastContextLogger: true,
appLogName: process.env.CNPMCORE_APP_LOG_NAME || `${appInfo.name}-web.log`,
coreLogName: process.env.CNPMCORE_CORE_LOG_NAME || 'egg-web.log',
agentLogName: process.env.CNPMCORE_AGENT_LOG_NAME || 'egg-agent.log',
errorLogName: process.env.CNPMCORE_ERROR_LOG_NAME || 'common-error.log',
outputJSON: Boolean(process.env.CNPMCORE_LOG_JSON_OUTPUT || false),
};
if (process.env.CNPMCORE_LOG_DIR) {
config.logger.dir = process.env.CNPMCORE_LOG_DIR;
}

Check warning on line 133 in config/config.default.ts

View check run for this annotation

Codecov / codecov/patch

config/config.default.ts#L132-L133 

Added lines #L132 - L133 were not covered by tests
if (process.env.CNPMCORE_LOG_JSON_OUTPUT) {
config.logger.outputJSON = Boolean(process.env.CNPMCORE_LOG_JSON_OUTPUT);
}

Check warning on line 136 in config/config.default.ts

View check run for this annotation

Codecov / codecov/patch

config/config.default.ts#L135-L136 

Added lines #L135 - L136 were not covered by tests

config.logrotator = {
// only keep 1 days log files
Expand Down