From 9655d2635a1d3c463126070b0e7dbeae223da130 Mon Sep 17 00:00:00 2001
From: Xaekai <ribbon13@gmail.com>
Date: Thu, 21 Jul 2016 18:17:38 -0700
Subject: [PATCH] Minor fixes

---
 index.js      | 6 +++---
 servcmd.sh.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/index.js b/index.js
index ed8ecac9..a364c7a1 100644
--- a/index.js
+++ b/index.js
@@ -45,7 +45,7 @@ process.stdin.on("data", function (data) {
     }
 });
 
-var net = require('net');
+var validIP = require('net').isIP;
 function handleLine(line) {
     if (line === "/reload") {
         Logger.syslog.log("Reloading config");
@@ -78,7 +78,7 @@ function handleLine(line) {
         sv.reloadPartitionMap();
     } else if (line.indexOf("/globalban") === 0) {
         var args = line.split(/\s+/); args.shift();
-        if (args.length >= 2 && net.isIP(args[0]) !== 0) {
+        if (args.length >= 2 && validIP(args[0]) !== 0) {
             var ip = args.shift();
             var comment = args.join(' ');
             require("./lib/database").globalBanIP(ip, comment, function (err, res) {
@@ -89,7 +89,7 @@ function handleLine(line) {
         }
     } else if (line.indexOf("/unglobalban") === 0) {
         var args = line.split(/\s+/); args.shift();
-        if (args.length === 1 && net.isIP(args[0]) !== 0) {
+        if (args.length >= 1 && validIP(args[0]) !== 0) {
             var ip = args.shift();
             require("./lib/database").globalUnbanIP(ip, function (err, res) {
                 if (!err) {
diff --git a/servcmd.sh.js b/servcmd.sh.js
index 1786171e..bb493368 100755
--- a/servcmd.sh.js
+++ b/servcmd.sh.js
@@ -105,8 +105,8 @@ function cmdouthndlr(type, args) {
 
 function cleanup(){
     console.info('\n',"Terminating.",'\n');
-    eventlog.stdin.end();
-    syslog.stdin.end();
+    eventlog.kill('SIGTERM');
+    syslog.kill('SIGTERM');
     client.end();
     process.exit(0);
 }