Kills server before deleting

Replaces old kill function with better one.
Kills a server before deletion
Removed useless variable

interfaces/rest.js

@@ -85,7 +85,7 @@ restserver.del('/gameservers/:id', function info(req, res, next){
 	if (!restauth(req, req.params.id, "g:delete")){res = unauthorized(res); return next();}
 	service = servers[req.params.id];
 	// TODO: if on, turn off
-	service.delete();	var ftpd = require('ftpd');
+	service.delete();
 	id = config.servers.splice(req.params.id,1);
 	saveconfig(config);
 	res.send("ok");
@@ -167,7 +167,7 @@ restserver.get('/gameservers/:id/off', function off(req, res, next){
 restserver.get('/gameservers/:id/kill', function off(req, res, next){
 	if (!restauth(req, req.params.id, "s:power")){res = unauthorized(res); return next();}
 	service = servers[req.params.id];
-	service.killpid();
+	service.kill();
 	res.send('ok')
 });
 

services/gameprocess.js

@@ -181,7 +181,7 @@ GameServer.prototype.turnoff = function(){
 	}
 };
 
-GameServer.prototype.killpid = function(){
+GameServer.prototype.kill = function(){
 	var self = this;
 	clearTimeout(self.queryCheck);
 	if (!self.status == OFF){
@@ -216,6 +216,7 @@ GameServer.prototype.create = function(){
 
 GameServer.prototype.delete = function(){
 	console.log("-----Deleting Server " + this.config.name + "-----");
+	this.kill();
 	deleteUser(this.config.user, function cb(){callback(null);});
 	console.log("----------")
 };
@@ -268,10 +269,6 @@ GameServer.prototype.restart = function(){
 	this.turnoff();
 };
 
-GameServer.prototype.kill = function(){
-	this.ps.kill();
-};
-
 GameServer.prototype.send = function(data){
 	if (this.status == ON || this.status == STARTING){
 		this.ps.write(data + '\n');