Merge pull request #1795 from msimerson/1791-fixups

fixing one bug hilighted another
haraka · Feb 1, 2017 · c715aaf · c715aaf
2 parents ffb97cf + 9c02964
commit c715aaf
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/bin/haraka b/bin/haraka
@@ -139,6 +139,7 @@ function mkDir (dstPath) {
     }
     catch (e) {
         // File exists
+        console.error(e);
         if (e.errno == 17) {
             warning(e.message);
         }
@@ -191,11 +192,12 @@ function copyFile (srcFile, dstFile) {
     }
     catch (e) {
         // File NOT exists
-        if (e.errno == 2) {
+        if (e.errno == -2) {
             fs.writeFileSync(dstFile, fs.readFileSync(srcFile));
             create(dstFile)
         }
         else {
+            console.log('copy ' + srcFile + ' to ' + dstFile);
             throw e;
         }
     }

diff --git a/plugins/limit.js b/plugins/limit.js
diff --git a/plugins/redis.js b/plugins/redis.js
diff --git a/server.js b/server.js
@@ -476,8 +476,6 @@ Server.init_master_respond = function (retval, msg) {
         return;
     }
 
-    if (!c.outbound) return;
-
     // Running under cluster, fork children here, so that
     // cluster events can be registered in init_master hooks.
     outbound.scan_queue_pids(function (err, pids) {