Skip to content

Commit 403a762

Browse files
committed
judge: add override config
1 parent e66a6cd commit 403a762

2 files changed

Lines changed: 14 additions & 8 deletions

File tree

packages/hydrojudge/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
{
22
"name": "@hydrooj/hydrojudge",
33
"bin": "bin/hydrojudge.js",
4-
"version": "3.5.0-beta.14",
4+
"version": "3.5.0-beta.15",
55
"main": "./src/index.ts",
66
"author": "undefined <i@undefined.moe>",
77
"repository": "https://github.com/hydro-dev/Hydro.git",
88
"dependencies": {
99
"@hydrooj/common": "workspace:^",
1010
"@hydrooj/utils": "workspace:^",
11-
"@opentelemetry/api": "^1.9.0",
12-
"@opentelemetry/exporter-trace-otlp-http": "^0.212.0",
13-
"@opentelemetry/sdk-node": "^0.212.0",
14-
"@zip.js/zip.js": "^2.8.21",
11+
"@opentelemetry/api": "^1.9.1",
12+
"@opentelemetry/exporter-trace-otlp-http": "^0.214.0",
13+
"@opentelemetry/sdk-node": "^0.214.0",
14+
"@zip.js/zip.js": "^2.8.23",
1515
"cac": "^6.7.14",
1616
"p-queue": "^9.1.0",
17-
"schemastery": "^3.17.2",
17+
"schemastery": "^3.18.0",
1818
"semver": "^7.7.4",
1919
"shell-quote": "^1.8.3",
2020
"superagent": "^10.3.0",
21-
"ws": "^8.19.0"
21+
"ws": "^8.20.0"
2222
},
2323
"preferUnplugged": true,
2424
"license": "AGPL-3.0-or-later",

packages/hydrojudge/src/config.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,15 @@ let config = global.Hydro
6868
}
6969
const configFilePath = (process.env.CONFIG_FILE || argv.options.config)
7070
? path.resolve(process.env.CONFIG_FILE || argv.options.config)
71-
: fs.existsSync(oldPath) ? oldPath : newPath;
71+
: fs.existsSync(newPath) ? newPath : oldPath;
7272
const configFile = fs.readFileSync(configFilePath, 'utf-8');
7373
Object.assign(base, yaml.load(configFile) as any);
74+
if (process.env.OVERRIDE_CONFIG) {
75+
if (fs.existsSync(process.env.OVERRIDE_CONFIG)) {
76+
const overrideConfigFile = fs.readFileSync(process.env.OVERRIDE_CONFIG, 'utf-8');
77+
Object.assign(base, yaml.load(overrideConfigFile) as any);
78+
} else console.warn('Override config file not found');
79+
}
7480
const cfg = JudgeSettings(base);
7581
return JudgeSettings(cfg);
7682
})();

0 commit comments

Comments
 (0)