bug fixes

packages/hydrooj/src/service/db.ts

@@ -62,7 +62,7 @@ export class MongoService extends Service {
         yield () => { this.client.close(); };
         this.db = this.client.db(url.database || 'hydro');
         await bus.parallel('database/connect', this.db);
-        this.ctx.setInterval(() => this.fixExpireAfter(), Time.hour);
+        yield this.ctx.setInterval(() => this.fixExpireAfter(), Time.hour);
     }
 
     public collection<K extends keyof Collections>(c: K) {

packages/hydrooj/src/service/monitor.ts

@@ -98,17 +98,14 @@ export async function updateJudge(args) {
     );
 }
 
-export function apply(ctx: Context) {
+export async function apply(ctx: Context) {
     if (process.env.NODE_APP_INSTANCE !== '0') return;
-    ctx.on('app/started', async () => {
-        sysinfo.get().then((info) => {
-            coll.updateOne(
-                { mid: info.mid, type: 'server' },
-                { $set: { ...info, updateAt: new Date(), type: 'server' } },
-                { upsert: true },
-            );
-            feedback();
-            setInterval(update, 1800 * 1000);
-        });
-    });
+    const info = await sysinfo.get();
+    coll.updateOne(
+        { mid: info.mid, type: 'server' },
+        { $set: { ...info, updateAt: new Date(), type: 'server' } },
+        { upsert: true },
+    );
+    feedback();
+    return ctx.setInterval(update, 1800 * 1000); // eslint-disable-line
 }

packages/hydrooj/src/service/worker.ts

@@ -18,7 +18,14 @@ export default class WorkerService extends Service {
 
     constructor(ctx: Context) {
         super(ctx, 'worker');
+    }
+
+    async *[Context.init]() {
         this.consume();
+        yield () => {
+            this.consuming = false;
+            return this.promise;
+        };
     }
 
     async getFirst() {
@@ -79,9 +86,4 @@ export default class WorkerService extends Service {
             };
         });
     }
-
-    public async stop() {
-        this.consuming = false;
-        await this.promise;
-    }
 }