From a58c36961f71854e2314f3372e8df71c9e172b29 Mon Sep 17 00:00:00 2001
From: undefined <masnn0@outlook.com>
Date: Sun, 27 Sep 2020 13:20:17 +0800
Subject: [PATCH] core: remove lib.logger

---
 packages/hydrooj/package.json           |  2 +-
 packages/hydrooj/src/entry/common.ts    |  3 +-
 packages/hydrooj/src/handler/problem.ts |  1 -
 packages/hydrooj/src/interface.ts       |  1 -
 packages/hydrooj/src/lib/logger.ts      | 41 -------------------------
 packages/hydrooj/src/model/user.ts      |  4 ++-
 6 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100644 packages/hydrooj/src/lib/logger.ts

diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json
index 41ad48ee1..869bdcd35 100644
--- a/packages/hydrooj/package.json
+++ b/packages/hydrooj/package.json
@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.13.21",
+    "version": "2.13.22",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",
diff --git a/packages/hydrooj/src/entry/common.ts b/packages/hydrooj/src/entry/common.ts
index e32b8ef41..f2943a627 100644
--- a/packages/hydrooj/src/entry/common.ts
+++ b/packages/hydrooj/src/entry/common.ts
@@ -10,9 +10,8 @@ const logger = new Logger('common', true);
 
 export const builtinLib = [
     'jwt', 'download', 'i18n', 'mail', 'useragent',
-    'md5', 'misc', 'paginate', 'hash.hydro', 'rank',
+    'crypto', 'misc', 'paginate', 'hash.hydro', 'rank',
     'validator', 'ui', 'sysinfo', 'testdata.convert.ini', 'testdataConfig',
-    'logger',
 ];
 
 export const builtinModel = [
diff --git a/packages/hydrooj/src/handler/problem.ts b/packages/hydrooj/src/handler/problem.ts
index 8191313eb..2d23ca8db 100644
--- a/packages/hydrooj/src/handler/problem.ts
+++ b/packages/hydrooj/src/handler/problem.ts
@@ -418,7 +418,6 @@ export class ProblemEditHandler extends ProblemManageHandler {
     @param('content', Types.String, isContent)
     async post(domainId: string, title: string, content: string) {
         const $update: Partial<Pdoc> = { title, content };
-        console.log(this.request.body);
         if (this.request.body.pid) $update.pid = checkPid(this.request.body.pid);
         const pdoc = await problem.get(domainId, this.request.params.pid);
         await problem.edit(domainId, pdoc.docId, $update);
diff --git a/packages/hydrooj/src/interface.ts b/packages/hydrooj/src/interface.ts
index 5b315315e..7c2b3175a 100644
--- a/packages/hydrooj/src/interface.ts
+++ b/packages/hydrooj/src/interface.ts
@@ -498,7 +498,6 @@ export interface Lib {
     'hash.hydro': typeof import('./lib/hash.hydro'),
     i18n: typeof import('./lib/i18n'),
     jwt: typeof import('./lib/jwt'),
-    logger: typeof import('./lib/logger'),
     mail: typeof import('./lib/mail'),
     md5: typeof import('./lib/crypto').md5,
     sha1: typeof import('./lib/crypto').sha1,
diff --git a/packages/hydrooj/src/lib/logger.ts b/packages/hydrooj/src/lib/logger.ts
deleted file mode 100644
index 23879b3d9..000000000
--- a/packages/hydrooj/src/lib/logger.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import serialize from 'serialize-javascript';
-
-function wrap(func: Function, type: string) {
-    return (...args: any) => {
-        const time = new Date();
-        func(...args);
-        if (global.Hydro.model.message) {
-            try {
-                global.Hydro.model.message.send(1, 1, serialize({ time, type, args }), 0);
-            } catch (e) {
-                func(e.message);
-            }
-        }
-    };
-}
-
-class Logger {
-    log: (...args: any[]) => void;
-
-    error: (...args: any[]) => void;
-
-    info: (...args: any[]) => void;
-
-    warn: (...args: any[]) => void;
-
-    debug: (...args: any[]) => void;
-
-    constructor() {
-        this.log = wrap(console.log, 'log');
-        this.error = wrap(console.error, 'error');
-        this.info = wrap(console.info, 'info');
-        this.warn = wrap(console.warn, 'warn');
-        this.debug = wrap(console.debug, 'debug');
-    }
-}
-
-const exp = new Logger();
-
-global.Hydro.lib.logger = exp;
-
-export = exp;
diff --git a/packages/hydrooj/src/model/user.ts b/packages/hydrooj/src/model/user.ts
index ce52c1efc..eae7341fd 100644
--- a/packages/hydrooj/src/model/user.ts
+++ b/packages/hydrooj/src/model/user.ts
@@ -7,11 +7,13 @@ import { BUILTIN_USERS, PRIV } from './builtin';
 import { UserNotFoundError, UserAlreadyExistError, LoginError } from '../error';
 import { User as _User, Udoc, Udict } from '../interface';
 import { Value } from '../typeutils';
+import { Logger } from '../logger';
 import pwhash from '../lib/hash.hydro';
 import * as db from '../service/db';
 import * as bus from '../service/bus';
 
 const coll: Collection<Udoc> = db.collection('user');
+const logger = new Logger('model/user');
 
 export async function setPassword(uid: number, password: string): Promise<Udoc> {
     const salt = String.random();
@@ -216,7 +218,7 @@ export async function create(
             gravatar: mail,
         });
     } catch (e) {
-        console.log(e);
+        logger.warn(e);
         throw new UserAlreadyExistError([uid, uname, mail]);
     }
     return uid;