Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: testdata(zip-> multi files)

Browse Source
This commit is contained in:
undefined committed 2020-12-18 01:31:42 +08:00
1 parent c30fbe1e6b
commit e7794090b2
17 files changed
+338 -335
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/src/entry/cli.ts
+10
View File
@@ -8,6 +8,7 @@ import {
import options from '../options';
import * as bus from '../service/bus';
import db from '../service/db';
import storage from '../service/storage';
const COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
const ARR = /=>.*$/mg;
@@ -56,6 +57,15 @@ export async function load() {
require('../options');
const opts = options();
await db.start(opts);
const modelSystem = require('../model/system');
const [endPoint, accessKey, secretKey, bucket, region, endPointForUser, endPointForJudge] = modelSystem.getMany([
'file.endPoint', 'file.accessKey', 'file.secretKey', 'file.bucket', 'file.region',
'file.endPointForUser', 'file.endPointForJudge',
]);
const sopts = {
endPoint, accessKey, secretKey, bucket, region, endPointForUser, endPointForJudge,
};
await storage.start(sopts);
for (const i of builtinLib) require(`../lib/${i}`);
await lib(pending, fail);
require('../service/gridfs');
packages/hydrooj/src/entry/master.ts
+13 -3
View File
@@ -11,6 +11,7 @@ import { Logger } from '../logger';
import options from '../options';
import * as bus from '../service/bus';
import db from '../service/db';
import storage from '../service/storage';
const logger = new Logger('entry/master');
const tmpdir = path.resolve(os.tmpdir(), 'hydro');
@@ -52,16 +53,25 @@ export async function load(call: Entry) {
});
const opts = options();
await db.start(opts);
await require('../model/system').runConfig();
const modelSystem = require('../model/system');
await modelSystem.runConfig();
const [endPoint, accessKey, secretKey, bucket, region, endPointForUser, endPointForJudge] = modelSystem.getMany([
'file.endPoint', 'file.accessKey', 'file.secretKey', 'file.bucket', 'file.region',
'file.endPointForUser', 'file.endPointForJudge',
]);
const sopts = {
endPoint, accessKey, secretKey, bucket, region, endPointForUser, endPointForJudge,
};
await storage.start(sopts);
require('../service/monitor');
for (const i of builtinModel) require(`../model/${i}`);
const modelSystem = require('../model/system');
const scripts = require('../upgrade');
let dbVer = (await modelSystem.get('db.ver')) ?? 0;
const expected = scripts.length;
while (dbVer < expected) {
logger.info('Upgrading database: from %d to %d', dbVer, expected);
await scripts[dbVer]();
const result = await scripts[dbVer]();
if (!result) break;
dbVer++;
await modelSystem.set('db.ver', dbVer);
}
packages/hydrooj/src/entry/worker.ts
+10 -4
View File
@@ -7,6 +7,7 @@ import {
import options from '../options';
import * as bus from '../service/bus';
import db from '../service/db';
import storage from '../service/storage';
export async function load() {
const pending = global.addons;
@@ -23,10 +24,15 @@ export async function load() {
]);
const opts = options();
await db.start(opts);
await new Promise((resolve) => {
bus.once('database/config', resolve);
require('../model/system');
});
const modelSystem = require('../model/system');
const [endPoint, accessKey, secretKey, bucket, region, endPointForUser, endPointForJudge] = modelSystem.getMany([
'file.endPoint', 'file.accessKey', 'file.secretKey', 'file.bucket', 'file.region',
'file.endPointForUser', 'file.endPointForJudge',
]);
const sopts = {
endPoint, accessKey, secretKey, bucket, region, endPointForUser, endPointForJudge,
};
await storage.start(sopts);
for (const i of builtinLib) require(`../lib/${i}`);
await lib(pending, fail);
require('../service/gridfs');