mirror/MCSManager
2
0
Fork 1
mirror of https://github.com/MCSManager/MCSManager.git synced 2025-02-17 15:59:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Test

Browse Source
This commit is contained in:
Suwings 2020-03-04 18:19:59 +08:00
parent 89217d69cd
commit 332bb92caa
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/Process/BaseMcserver.js
View File

@ -266,22 +266,20 @@ class ServerProcess extends EventEmitter {
stdio: 'pipe'
}
if (this.dataModel.dockerConfig.isDocker) {
// Docker 启动
// 选用虚拟化技术启动后，将不再执行下面代码逻辑，由专属的进程启动方式启动。
this.dockerStart().catch((err) => {
throw err;
});
// 阻止继续运行下去
return true;
} else {
try {
try {
if (this.dataModel.dockerConfig.isDocker) {
// Docker 启动
// 选用虚拟化技术启动后，将不再执行下面代码逻辑，由专属的进程启动方式启动。
this.dockerStart();
// 阻止继续运行下去
return true;
} else {
//确定启动方式
this.dataModel.highCommande ? this.customCommandStart() : this.templateStart();
} catch (err) {
this.stop();
throw new Error('进程启动时异常:' + err.name + ":" + err.message);
}
} catch (err) {
this.stop();
throw new Error('进程启动时异常:' + err.name + ":" + err.message);
}
this._run = true;