更新langs.yaml

Author: undefined-moe

examples/langs.yaml

@@ -56,7 +56,7 @@ py3:
 php:
     type: interpreter
     code_file: foo.php
-    execute: /usr/bin/php foo.php
+    execute: /usr/bin/php ${name}
 rs:
     type: compiler
     compile: /usr/bin/rustc -O -o ${dir}/${name} ${dir}/foo.rs
@@ -70,7 +70,7 @@ hs:
 js:
     type: interpreter
     code_file: foo.js
-    execute: /usr/bin/jsc ${dir}/foo.js
+    execute: /usr/bin/jsc ${dir}/${name}
 go:
     type: compiler
     compile: /usr/bin/go build -o ${name} foo.go
@@ -79,7 +79,7 @@ go:
 rb:
     type: interpreter
     code_file: foo.rb
-    execute: /usr/bin/ruby foo.rb
+    execute: /usr/bin/ruby ${name}
 cs:
     type: compiler
     compile: /usr/bin/mcs -optimize+ -out:${dir}/${name} ${dir}/foo.cs

judger/log.js

@@ -5,13 +5,28 @@ function warp(func) {
     };
 }
 
-module.exports = {
-    log: warp(console.log),
-    error: warp(console.error),
-    info: warp(console.info),
-    warn: warp(console.warn),
-    debug: warp(console.debug),
-    submission(id, payload = {}) {
-        console.log(`${new Date()} ${id}`, payload);
-    },
-};
+class Logger {
+    constructor() {
+        this.log = warp(console.log, 'log');
+        this.error = warp(console.error, 'error');
+        this.info = warp(console.info, 'info');
+        this.warn = warp(console.warn, 'warn');
+        this.debug = warp(console.debug, 'debug');
+        this.submission = (id, payload = {}) => {
+            console.log(`${new Date()} ${id}`, payload);
+        };
+    }
+
+    logger(logger) {
+        this.log = warp(logger.log, 'log');
+        this.error = warp(logger.error, 'error');
+        this.info = warp(logger.info, 'info');
+        this.warn = warp(logger.warn, 'warn');
+        this.debug = warp(logger.debug, 'debug');
+        this.submission = (id, payload = {}) => {
+            logger.log(`${new Date()} ${id}`, payload);
+        };
+    }
+}
+
+module.exports = new Logger();

module/hydro.json

@@ -1,6 +1,5 @@
 {
     "id": "judger",
     "version": "1.2.0",
-    "description": "HydroJudger",
-    "master": true
+    "description": "HydroJudger"
 }

module/service.js

@@ -2,14 +2,18 @@
 /* eslint-disable no-await-in-loop */
 const fs = require('fs');
 const path = require('path');
+const cluster = require('cluster');
 const child = require('child_process');
+const yaml = require('js-yaml');
 
 async function postInit() {
+    // Only start a single daemon
+    if (cluster.isMaster || cluster.worker.id > 1) return;
     const config = require('../judger/config');
-    // eslint-disable-next-line import/no-unresolved
-    config.LANGS = require('./__langs.json');
-    const { mkdirp, rmdir, compilerText } = require('../judger/utils');
     const log = require('../judger/log');
+    log.logger(global.Hydro.lib.logger);
+    config.LANGS = yaml.safeLoad(await global.Hydro.model.system.get('judger.langs'));
+    const { mkdirp, rmdir, compilerText } = require('../judger/utils');
     const tmpfs = require('../judger/tmpfs');
     const { FormatError, CompileError, SystemError } = require('../judger/error');
     const { STATUS_COMPILE_ERROR, STATUS_SYSTEM_ERROR } = require('../judger/status');

module/setting.js

@@ -0,0 +1,7 @@
+module.exports = {
+    langs: {
+        type: 'text',
+        default: JSON.stringify(require('./__langs.json')),
+        description: 'Language file settings',
+    },
+};

package.json

@@ -10,15 +10,15 @@
     "minimist": "^1.2.5",
     "p-queue": "^6.4.0",
     "shell-quote": "^1.7.2",
-    "systeminformation": "^4.26.5",
+    "systeminformation": "^4.26.9",
     "ws": "^7.3.0"
   },
   "license": "GPL-3.0-only",
   "devDependencies": {
-    "eslint": "^6.2.2",
-    "eslint-config-airbnb-base": "^14.1.0",
-    "eslint-plugin-import": "^2.20.2",
-    "hydro-build": "^1.0.1"
+    "eslint": "^7.2.0",
+    "eslint-config-airbnb-base": "^14.2.0",
+    "eslint-plugin-import": "^2.21.2",
+    "hydro-build": "^1.0.4"
   },
   "bin": {
     "judger": "judger/entrypoint.js"