整理 - 注释说明

This commit is contained in:
suwings 2018-06-02 22:00:53 +08:00
parent 0431fba0cb
commit c720876fe8
2 changed files with 8 additions and 6 deletions

View File

@ -11,9 +11,9 @@ MCSERVER.Schedule.container = {};
MCSERVER.Schedule.dataModel = new DataModel(PATH) MCSERVER.Schedule.dataModel = new DataModel(PATH)
MCSERVER.Schedule.dataModel.list = []; MCSERVER.Schedule.dataModel.list = [];
//任务具体执行函数
function serverExe(servername, commande) { function serverExe(servername, commande) {
if (commande.length == 0) return; if (commande.length == 0) return;
// MCSERVER.log("[ Schedule ] [", servername, "] 服务器计划执行: ", commande);
try { try {
if (commande == "__start__") { if (commande == "__start__") {
serverModel.startServer(servername); serverModel.startServer(servername);
@ -27,10 +27,10 @@ function serverExe(servername, commande) {
serverModel.startServer(servername); serverModel.startServer(servername);
}, 15000) }, 15000)
} }
//默认执行命令 // 默认执行命令
serverModel.sendCommand(servername, commande); serverModel.sendCommand(servername, commande);
} catch (err) { } catch (err) {
//默认忽略定时计划任务错误 // 默认忽略定时计划任务错误
// MCSERVER.log("[ Schedule ] [", servername, "] 服务器计划执行时报错 | 已忽略"); // MCSERVER.log("[ Schedule ] [", servername, "] 服务器计划执行时报错 | 已忽略");
} }

View File

@ -4,13 +4,15 @@ const {
const permssion = require('../../helper/Permission'); const permssion = require('../../helper/Permission');
const response = require('../../helper/Response'); const response = require('../../helper/Response');
const schedulejob = require('../../helper/Schedule'); const schedulejob = require('../../helper/Schedule');
const UUID = require('uuid');
const tools = require('../../core/tools'); const tools = require('../../core/tools');
const serverModel = require('../../model/ServerModel'); const serverModel = require('../../model/ServerModel');
//每个服务器最大数量 const UUID = require('uuid');
//每个服务器最大数量计划任务
const MAX_MASK = MCSERVER.localProperty.schedule_max || 10; const MAX_MASK = MCSERVER.localProperty.schedule_max || 10;
//创建计划任务函数
function CreateScheduleJob(obj) { function CreateScheduleJob(obj) {
let id = tools.randomString(6) + "_" + new Date().getTime(); let id = tools.randomString(6) + "_" + new Date().getTime();
let thisServer = serverModel.ServerManager().getServer(obj.servername); let thisServer = serverModel.ServerManager().getServer(obj.servername);
@ -19,6 +21,7 @@ function CreateScheduleJob(obj) {
} }
//过滤计划任务列表
function getMineScheduleList(servername) { function getMineScheduleList(servername) {
let list = MCSERVER.Schedule.dataModel.list; let list = MCSERVER.Schedule.dataModel.list;
sendlist = []; sendlist = [];
@ -74,7 +77,6 @@ WebSocketObserver().listener('schedule/delete', (data) => {
if (permssion.isCanServer(username, obj.servername || "")) { if (permssion.isCanServer(username, obj.servername || "")) {
try { try {
schedulejob.deleteScheduleJob(obj.id || ""); schedulejob.deleteScheduleJob(obj.id || "");
response.wsMsgWindow(data.ws, "删除序号:" + obj.id + "计划任务"); response.wsMsgWindow(data.ws, "删除序号:" + obj.id + "计划任务");
} catch (err) { } catch (err) {