Arma3_Exile/arma-server-web-admin
1
0
Fork 0
mirror of https://github.com/Dahlgren/arma-server-web-admin.git synced 2024-08-30 17:22:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linux compability in manager

Browse Source
This commit is contained in:
Björn Dahlgren 2014-11-24 01:56:54 +01:00
parent 975059d484
commit 1eb4c04ced
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manager.js
View File

@ -66,6 +66,14 @@ Server.prototype.queryStatus = function() {
Server.prototype.start = function() {
var startParams = [];
var gamePath = this.armaServerPath();
var options = null;
if (config.type === "linux") {
options = {
cwd: config.path,
env: process.env,
};
}
if (config.type === "wine") {
gamePath = "wine";
@ -84,29 +92,29 @@ Server.prototype.start = function() {
console.log(gamePath);
console.log(startParams);
var process = spawn(gamePath, startParams);
var instance = spawn(gamePath, startParams, options);
var self = this;
process.stdout.on('data', function (data) {
instance.stdout.on('data', function (data) {
console.log('stdout: ' + data);
});
process.stderr.on('data', function (data) {
instance.stderr.on('data', function (data) {
console.log('stderr: ' + data);
});
process.on('close', function (code) {
instance.on('close', function (code) {
console.log('child process exited with code ' + code);
clearInterval(self.queryStatusInterval);
self.state = null;
self.pid = null;
self.process = null;
self.instance = null;
self.emit('state');
});
this.pid = process.pid;
this.process = process;
this.pid = instance.pid;
this.instance = instance;
this.queryStatusInterval = setInterval(function () {
self.queryStatus();
}, queryInterval);
@ -120,7 +128,7 @@ Server.prototype.stop = function(cb) {
var handled = false;
var self = this;
this.process.on('close', function (code) {
this.instance.on('close', function (code) {
if (!handled) {
handled = true;
@ -130,7 +138,7 @@ Server.prototype.stop = function(cb) {
}
});
this.process.kill();
this.instance.kill();
setTimeout(function() {
if (!handled) {