git2consul - npm Package Compare versions

Comparing version 0.12.2 to 0.12.3

CHANGELOG.md

@@ -0,1 +1,5 @@
+v0.12.3
+
+* Fixes a bug where a repo could stop updating if `source_root` was used, really this time.
+
 v0.12.2
@@ -2,0 +6,0 @@

consul_data/raft/peers.json

@@ -1,1 +0,1 @@
-["172.17.4.199:8300"]
+["172.17.8.26:8300"]

lib/consul/index.js

@@ -84,3 +84,3 @@ var _ = require('underscore');
 
-  logger.debug('JSON file %s yielded %s keys', prefix, writes.length);
+  logger.debug('Expandable file %s yielded %s keys', prefix, writes.length);
 
@@ -94,3 +94,2 @@ cb = _.after(writes.length, cb);
 
-
 /**
@@ -228,4 +227,4 @@ * If a file was modified, read its new value and update consul's KV store.
     // If there are no pending records, callback with all errors seen, if any.
-    if (pending_records === 0) {
-      cb((errors_seen.length > 0) ? errors_seen : null);
+    if (pending_records <= 0) {
+      _.once(cb((errors_seen.length > 0) ? errors_seen : null));
     }
@@ -252,13 +251,21 @@
         // Store added/modified file
+        // FIXME: This will definitely fail in scenarios where record path is not in branch source root.
         if (record.path === branch.common_properties) {
-          branch.listAdditionalPropertyFiles(records, function(err, additionRecords) {
-            process_records(branch, additionRecords, function(errs) {
-              if (errs) {
-                return cb("Some consul updates failed:\n" + errs.join('\n'));
-              }
+          ++pending_records;
+
+          file_modified(branch, record.path, function(err) {
+            branch.listAdditionalPropertyFiles(records, function(err, additionalRecords) {
+              if (err) return check_pending(err);
+              if (additionalRecords.length == 0) return check_pending();
+              process_records(branch, additionalRecords, function(errs) {
+                if (errs) check_pending("Some consul updates failed:\n" + errs.join('\n'));
+
+                check_pending();
+              });
             });
           });
+        } else {
+          ++pending_records;
+          file_modified(branch, record.path, check_pending);
         }
-        ++pending_records;
-        file_modified(branch, record.path, check_pending);
         break;
@@ -265,0 +272,0 @@ case 'D':

lib/git/branch.js

@@ -231,2 +231,4 @@ var fs = require('fs');
           // and start from scratch.
+          logger.error("Failed to get current ref due to %s", err);
+
           return this_obj.startFromScratch(null, cb, cb);
@@ -238,3 +240,6 @@ }
           // and start from scratch.
-          return this_obj.startFromScratch(null, cb, cb);
+          if (err) {
+            logger.error("Failed to get current ref due to %s", err);
+            return this_obj.startFromScratch(null, cb, cb);
+          }
 
@@ -241,0 +246,0 @@ this_obj.busy = false;

package.json

 {
   "name": "git2consul",
   "description": "System for moving data from git to consul",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "contributors": [
@@ -6,0 +6,0 @@ {

No alert changes

Improved metrics

Total package byte prevSize

28409820

Lines of code

3682

increased by0.27%

No dependency changes