consistent-cluster 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b9a381e3ba8ba30496deec02f82acb44f03c608
-  data.tar.gz: d91a5fe213f3fc911c8e8dae829b8489b020d632
+  metadata.gz: 1d7447f969567786aef54f72b5c03abfa42bb860
+  data.tar.gz: a6b96f1db23abe63dc2b1411875c0fcb98a2bd4d
 SHA512:
-  metadata.gz: 24a73b4697edc754ca7ca59ca039534540f16da968050ada4f5a80b01fd28cc650e2a8e08dd445732c57c34f5923293d8312190e5cccb92edd2c2c2a9099ee90
-  data.tar.gz: a8b4369cf7f64d8b597ad75004f93c1f6b96e4d578f596de8ceb43d3a7ea58387a22cbe7cbcb17e9a1794af46b44d324d81439f4d4a90c9d2a5b9280d5c5cd86
+  metadata.gz: ad96b31d7dd661ca27464b94a8d84d1f7a332cb46d4f423825fbdf0884f1845984537131f02e6839b3a2ded5959acfa1403b85620f7f09babc1b5b4f33c0fb72
+  data.tar.gz: 03abd91418a5a9ddc432fd1448b1dbf3ca71cf93dc93a95fac6a1bdae41bf328753bd0fc17aa925249c8d019eeaa0273848e941f3f1022633f494f022ee5329f

data/lib/consistent-cluster/sync-client.rb

@@ -11,6 +11,8 @@ module ConsistentCluster
 
     def initialize(options)
 
+      @syncingMutex = Mutex.new
+
       @data = {}
       @cluster = {}
       @node_register = {}
@@ -20,10 +22,19 @@ module ConsistentCluster
 
       @create_proc = options[:create_proc]
       @destroy_proc = options[:destroy_proc]
-      @after_sync_proc = options[:after_sync_proc] 
+      @after_sync_proc = options[:after_sync_proc]
+      @log_proc = options[:log_proc]
+
+      @logger = if options[:log_file]
+        Logger.new(options[:log_file])
+      elsif STDERR || STDOUT
+        Logger.new(STDERR || STDOUT)
+      else
+        Logger.new(options[:nil])
+      end
+
+      @last_sync_at = 0
 
-      @to_sync,@syncing = false,false
-      
       @path = options[:zookeeper_path]
 
       @zk = ZK.new(options[:zookeeper_service],reconnect: true)
@@ -65,47 +76,81 @@ module ConsistentCluster
       server
     end
 
+    def invoke_sync
+      sync_services
+    end
+
+    def local_version
+      @data
+    end
+
+    def remote_version
+      app_names = get_app_names(watch: false)
+
+      data = {}
+      app_names.each do |app_name|
+        app_content = get_app_content(app_name, watch: false)
+        data[app_name] = app_content
+      end
+      data
+    end
+
+    def zookeeper_path
+      @path
+    end
+
+    def last_sync_at
+      @last_sync_at
+    end
+
     protected
 
     def sync_services
-      @to_sync = true
-      if !@syncing
+      @syncingMutex.synchronize do
         syncing_process
       end
     end
 
     def syncing_process
-      @syncing = true
-      while @to_sync
-        @to_sync = false
-        app_names = get_app_names
-        current_app_names = @cluster.keys
-
-        to_update = current_app_names&app_names
-        to_create = app_names - current_app_names
-        to_destroy = current_app_names - app_names
-
-        to_update.each do |app_name|
-          update_service(app_name)
-        end
+      app_names = get_app_names
+      current_app_names = @cluster.keys
 
-        to_create.each do |app_name|
-          create_service(app_name)
-        end
+      to_update = current_app_names&app_names
+      to_create = app_names - current_app_names
+      to_destroy = current_app_names - app_names
 
-        to_destroy.each do |app_name|
-          destroy_service(app_name)
-        end
+      to_update.each do |app_name|
+        update_service(app_name)
+      end
+
+      to_create.each do |app_name|
+        create_service(app_name)
+      end
+
+      to_destroy.each do |app_name|
+        destroy_service(app_name)
       end
-      @syncing = false
-      if @after_sync_proc
+
+      @last_sync_at = Time.now.to_i
+
+      if @after_sync_proc || @log_proc
         clone_data = Marshal.load(Marshal.dump(@data)) #avoid change outside
-        @after_sync_proc.call(clone_data)
+
+        if @after_sync_proc
+          @after_sync_proc.call(clone_data)
+        end
+
+        if @log_proc
+          debugInfo = @log_proc.call(@data).to_s
+          if debugInfo != ""
+            @logger.info debugInfo
+          end
+        end
       end
     end
 
-    def get_app_names
-      @zk.children(@path, watch: true)
+    def get_app_names(options = {watch: true})
+      @zk.children(@path, watch: options[:watch])
     end
 
     def create_service(app_name)
@@ -130,7 +175,7 @@ module ConsistentCluster
       end
 
     rescue Exception => boom
-      puts "sync create :#{app_name} raise #{boom.class} - #{boom.message}"
+      @logger.error "syncClientError when create :#{app_name} raise #{boom.class} - #{boom.message}"
     end
 
     def destroy_service(app_name)
@@ -151,7 +196,7 @@ module ConsistentCluster
       end
 
     rescue Exception => boom
-      puts "sync destroy :#{app_name} raise #{boom.class} - #{boom.message}"
+      @logger.error "syncClientError when destroy :#{app_name} raise #{boom.class} - #{boom.message}"
     end
 
     def update_service(app_name)
@@ -166,15 +211,15 @@ module ConsistentCluster
         create_service(app_name)
       end
     rescue Exception => boom
-      puts "sync update :#{app_name} raise #{boom.class} - #{boom.message}"
+      @logger.error "syncClientError when update :#{app_name} raise #{boom.class} - #{boom.message}"
     end
 
-    def get_app_content(app_name)
+    def get_app_content(app_name, options={watch: true})
       app_path = "#{@path}/#{app_name}"
-      content = @zk.get(app_path, watch: true).first
+      content = @zk.get(app_path, watch: options[:watch]).first
       content
     end
 
   end
 
-end
+end

data/lib/consistent-cluster/version.rb

@@ -1,3 +1,3 @@
 module ConsistentCluster
-  Version = "1.0.3"
-end
+  Version = "1.0.4"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consistent-cluster
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - jeffrey6052
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomic
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 一致性哈希集群