kitchen_hooks 1.7.5 → 1.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef6e686e12474334dac278347907e0217f4c6988
-  data.tar.gz: bffb695626d6390acaf5d20aeacdc10900d819fa
+  metadata.gz: ba6350e2e32bd9410d65d847737709e27864a974
+  data.tar.gz: f783adc4c5c19137fefb9969444891907be5475f
 SHA512:
-  metadata.gz: 7cce1b540f68b1c9b5c29001dc973e9237a16c02cfa5ce9c725f5169b9794dc29e09999842b4140d22c52ba741530315773b9769fe27117a9131f3c86709da66
-  data.tar.gz: 53b7d4986200d24f82cdac784045506583e3b0a90e3808b2f94f2880215cb8095386f7485d7e34c7e755d4fe0f65b9c8da1af02600d9ee4316612ec6cc8f21db
+  metadata.gz: d547cd54fbda16065b833ed61bf06b5d3f3df8fb69e0d610bbbfd4ecbb505015c4d95a9998d107a201c02432dad483fc20c660e9a75aa4554ce2b46d58fc4e2b
+  data.tar.gz: b0f1be8e6013b8083d201647e0baf9d0d2465b84bef0b3cff1eee4fd8459e448506c097ef88f05692eb811c93b111d439dbda17c77cb02d11190dc317f4c6ce1

data/Readme.md

@@ -122,6 +122,7 @@ The `server` command also exposes some options for Sinatra configuration. See
 ### 1.7
 
 * Sync nodes between Chef servers
+* Speedup sync by cachine Ohai update times
 
 ### 1.6
 

data/VERSION

@@ -1 +1 @@
-1.7.5
+1.7.6

data/lib/kitchen_hooks/app.rb

@@ -18,7 +18,12 @@ module KitchenHooks
 
     enable :sessions
 
-    def self.db! path
+    def self.db! path=@@db_path
+      if defined? @@db
+        @@db.flush
+        @@db.close
+      end
+      @@db_path = path
       @@db = Daybreak::DB.new path
     end
 
@@ -27,6 +32,7 @@ module KitchenHooks
     def self.close!
       @@sync_worker.kill
       @@backlog_worker.kill
+      @@db.flush
       @@db.close
     end
 
@@ -134,7 +140,7 @@ module KitchenHooks
       error = nil if error == true
       entry = { type: type, event: event }
       entry.merge!(error: error, type: 'failure') if error
-      db.synchronize do
+      db.lock do
         db[Time.now.to_f] = entry
       end
       db.flush
@@ -159,14 +165,11 @@ module KitchenHooks
         db.set! 'meta_cached_nodes', sync_servers.cached_nodes
       end
       sync = sync_servers.status
-
-      if sync.nil?
-        mark "Couldn't sync Chef servers (unknown issue)", 'unsynced'
-        return
-      end
-
+      puts 'Sync completed'
+      db!
       sync_tag = sync[:num_failures].zero? ? 'synced' : 'unsynced'
       mark sync, sync_tag
+      db!
     end
 
 

data/lib/kitchen_hooks/helpers/sync_servers.rb

@@ -107,7 +107,7 @@ private
     nodes.each do |n|
       next if failures.include? n.name
       @cached_nodes[n.name] = n.automatic.ohai_time.to_f
-      successes << n
+      successes << n.name
     end
 
     deleted.each do |n|
@@ -118,18 +118,15 @@ private
       end
     end
 
-    puts 'Sync completed'
     return {
       deleted: deleted,
       failures: failures,
       successes: successes,
-      num_successes: nodes.length - failures.length,
+      num_successes: successes.length,
       num_failures: failures.length,
       num_deletions: deleted.length,
       num_nodes: nodes.length
     }
-  # rescue
-  #   return nil
   end
 
 end

data/lib/kitchen_hooks/helpers.rb

@@ -344,10 +344,13 @@ module KitchenHooks
         if event.is_a? String
           event
         else
-          'Synced <b>%d</b> of <b>%d</b> nodes (%s, %s elapsed)' % [
+          num_deletions = event[:num_deletions].to_i
+          deletions = '%s, ' % pluralize(num_deletions, 'deletion')
+          deletions = '' unless num_deletions > 0
+          'Synced <b>%d</b> of <b>%d</b> nodes (%s%s elapsed)' % [
             event[:num_successes],
             event[:num_nodes],
-            pluralize(event[:num_failures], 'failure'),
+            deletions,
             humanize_seconds(event[:elapsed])
           ]
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.7.6
 platform: ruby
 authors:
 - Sean Clemmer