freifunk-bot

commit 752f2cca8a66619ee1ce543926b5e6527d8c7fbe
parent 949e25c41781668203e976ba1dd9f54d4dec96a9
Author: MTRNord <mtrnord1@gmail.com>
Date:   Sat, 10 Sep 2016 20:13:27 +0200

Switch to parralel

Diffstat:
M
handlers/irc.js
 | 
18
+++++++++---------
M
main.js
 | 
41
+++++++++++++++++++++--------------------

2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/handlers/irc.js b/handlers/irc.js
@@ -67,15 +67,15 @@ for (var key in params_config["servers"]) {
     var main_channel = params_config["servers"][key]["main_channel"];
     var active = params_config["servers"][key]["active"];
     var debug = params_config["servers"][key]["debug"];
-    // if (debug == 1) {
-    //   var debug = true;
-    // }else{
-    //   var debug = false;
-    // }
-    // if (debug == false) {
-    //   console = console || {};
-    //   console.log = function(){};
-    // }
+    if (debug == 1) {
+      var debug = true;
+    }else{
+      var debug = false;
+    }
+    if (debug == false) {
+      console = console || {};
+      console.log = function(){};
+    }
     if (active == 1) {
       bot[key] = new irc.Client(serveraddress, botname, {
         debug: debug,
diff --git a/main.js b/main.js
@@ -145,26 +145,27 @@ var j = schedule.scheduleJob('59 3 * * *', function(){
 });
 
 //Startup
-async.whilst(
-  function (callback) {
-    // callback has to be called by `uploadImage` when it's done
-    irc.ircPreload(callback)
-  },
-  function (callback) {
-    //Activate IRC-Bot Command Handler
-    irc.ircBotCommands(callback)
-  },
-  function (callback) {
-    getNodes.saveNodes(callback)
-  },
-  function (callback) {
-    telegram.start(callback)
-  },
-  function (callback) {
-    //Run Mainfunction 20seconds after script start
-    setTimeout(function() { GetData(callback); }, 20000)
-  },
-  function(err, n) {
+async.parallel([
+    function (callback) {
+      // callback has to be called by `uploadImage` when it's done
+      irc.ircPreload(callback)
+    },
+    function (callback) {
+      //Activate IRC-Bot Command Handler
+      irc.ircBotCommands(callback)
+    },
+    function (callback) {
+      getNodes.saveNodes(callback)
+    },
+    function (callback) {
+      telegram.start(callback)
+    },
+    function (callback) {
+      //Run Mainfunction 20seconds after script start
+      setTimeout(function() { GetData(callback); }, 20000)
+    }
+  ],
+  function(err, result) {
     if (err) {
       console.log(err)
     }