From b3aa0a5e09ec29bb4cd9187fecd617e7ecb7f4d7 Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 30 Oct 2020 14:50:16 +0800 Subject: [PATCH] core: add logger for task --- packages/hydrojudge/package.json | 2 +- packages/hydrojudge/src/cases.ts | 2 +- packages/hydrojudge/src/service.ts | 1 + packages/hydrooj/package.json | 2 +- packages/hydrooj/src/model/task.ts | 3 +++ 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/hydrojudge/package.json b/packages/hydrojudge/package.json index c1b18fd35..7896b7a80 100644 --- a/packages/hydrojudge/package.json +++ b/packages/hydrojudge/package.json @@ -1,7 +1,7 @@ { "name": "@hydrooj/hydrojudge", "bin": "bin/hydrojudge.js", - "version": "2.1.9", + "version": "2.1.10", "main": "package.json", "author": "masnn", "dependencies": { diff --git a/packages/hydrojudge/src/cases.ts b/packages/hydrojudge/src/cases.ts index 7acc30748..ce8a13ae3 100644 --- a/packages/hydrojudge/src/cases.ts +++ b/packages/hydrojudge/src/cases.ts @@ -193,7 +193,7 @@ async function readAutoCases(folder, { next }) { return config; } -export async function readYamlCases(folder: string, cfg: Dictionary, args) { +export async function readYamlCases(folder: string, cfg: Dictionary = {}, args) { const config: any = { checker_type: 'default', count: 0, diff --git a/packages/hydrojudge/src/service.ts b/packages/hydrojudge/src/service.ts index e2c06feac..e3ba0f648 100644 --- a/packages/hydrojudge/src/service.ts +++ b/packages/hydrojudge/src/service.ts @@ -187,6 +187,7 @@ async function postInit() { this.stat = {}; this.stat.receive = new Date(); this.request = request; + logger.debug('%o', request); } async handle() { diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 609ad865d..e979e5fe7 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "2.13.28", + "version": "2.13.29", "bin": "bin/hydrooj.js", "main": "dist/loader.js", "typings": "dist/loader.d.ts", diff --git a/packages/hydrooj/src/model/task.ts b/packages/hydrooj/src/model/task.ts index d334aa66b..85ee6045f 100644 --- a/packages/hydrooj/src/model/task.ts +++ b/packages/hydrooj/src/model/task.ts @@ -1,8 +1,10 @@ import moment from 'moment-timezone'; import { FilterQuery, ObjectID } from 'mongodb'; import { Task } from '../interface'; +import { Logger } from '../logger'; import * as db from '../service/db'; +const logger = new Logger('model/task'); const coll = db.collection('task'); export async function add(task: Partial & { type: string }) { @@ -34,6 +36,7 @@ export async function getFirst(query: FilterQuery) { q.executeAfter = q.executeAfter || { $lt: new Date() }; const res = await coll.findOneAndDelete(q); if (res.value) { + logger.debug('%o', res.value); if (res.value.interval) { await coll.insertOne({ ...res.value, executeAfter: moment().add(...res.value.interval).toDate(),