reminder-client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e4b20dadedd3af348a6f852daa7d2259dcf7b16
-  data.tar.gz: e6d69823fb71b2f49a59c03c941cfad7935376ad
+  metadata.gz: ee3395d42bb9f436bf81ceb00546fbbe40542256
+  data.tar.gz: d3e0ea6cb47b8aa257f35c5d5cb4bccba4ce980a
 SHA512:
-  metadata.gz: a5716c61a67bd93fe1a5055f074491d04a0cc5c3a6066f850eb92544e4836f44d07793e78d5c5a0c3f2de0b8bfcad5adce4f597a1b863cc838521152393d3457
-  data.tar.gz: 3d0be3d23fb5c46d64bb6bbf1b1c78542e7cb02efe89d68bd7923dad9072cba6ed442896012f2662b7f5f53d09395365e682f54d8f9302447281a69df5d2bad4
+  metadata.gz: 84810a7b27105dc01e95af166921c12e4e34c1e066c35f035b2620e9fde6adf42a8cba540b6631d6caf34bae5f0fd97d1111c5bbd5ff2ef55616fe3d25fc0593
+  data.tar.gz: e86d6ccc9f7a4e2c0424924d40450ffb91e969ffd2313847ed52b3241f390d43843d238921ac0dc12eb69ed642c67f2cab287675ed81cb14b84d8fb4740bab68

data/lib/reminder-client.rb

@@ -1,5 +1,8 @@
 require 'reminder-client'
 require 'reminder-client/configcenter'
+require 'reminder-client/server_info'
+require 'reminder-client/http_model'
+require 'reminder-client/thrift_model'
 
 class ReminderClient < Zoo
   def initialize(options = {})

data/lib/reminder-client/configcenter.rb

@@ -1,8 +1,8 @@
 #!/usr/math/bin/ruby
 
 require 'zookeeper'
-require 'eventmachine'
 require 'zk'
+require 'yajl'
 
 # Public: Create a Zk instence and connect, the following 
 # relaying on it, it will block until connected successfully.
@@ -17,132 +17,102 @@ require 'zk'
 #
 # Returns a Zoo instance.
 class Zoo
+
+  SERVER_FOUND_BASE_PATH = "services" 
+  SERVER_TYPE_HTTP = "http"
+  SERVER_TYPE_THRIFT = "thrift"
+
+
   def initialize(options)
     p "start connect to #{options[:zk_address]}"
     @zk = ZK.new(options[:zk_address])
     # @config_center_backend = options[:config_center_backend]
-    
-    # @path = "/rbtest"
-    # default paramters 
-    # @server_found_base_path = "/xserver"
-    # @server_config_base_path = "/xconfig"
-    # @server_config_sub_path= "/ctest"
-    # paramters to set
-    # @server_found_base_path = options[:zk_server_found_base_path]
-    # @server_config_base_path = options[:zk_server_config_base_path]
-    # @server_config_sub_path= options[:zk_server_config_sub_path]
-    puts "init succ #{@zk}"
+    @parser = Yajl::Parser
+    @encoder = Yajl::Encoder
+    puts "zk successfully connected to #{options[:zk_address]}"
   end
-  
-  
+
+
   # Public: zk server found server part, and it will create a ephemeral path 
   # with current server's service ip, address, or so on.
   #
   # option  - The hash :ip_port -> service address .eg "192.168.3.1:2222".
   # child(option) - The sub-path name.
   #
-  # Examples
-  #
-  #   server_found_server({ server_found_base_path = "/stat-server" })
-  #   server_found_server({ server_found_base_path = "/stat-server" }, "child")
-  #   # => nil
-  #
-  # Returns nil.
-  def server_found_server(option, child = 'default')
-    #fork do
-    # @zk.reopen()
-    re = @zk.create(option[:server_found_base_path] + "/" + child, option[:ip_port], :ephemeral => true, :sequence => true)
-    puts "create ephemeral path #{re} with data #{option} succ !!!"
+  def server_found_server(option, member_path = 'default')
+    # todo reise problem if some key params is nil 
+    #raise "error" if 
+    server_info = ServerInfo.new(option)
+
+    p "input params is #{option}"
+    p server_info
+    server_json = @encoder.encode(server_info.getHash)
+    create_path = get_combined_path([SERVER_FOUND_BASE_PATH, server_info.serviceType, server_info.groupPath, server_info.memberName])
+    # create parent path if not exists
+    create_parentPath([SERVER_FOUND_BASE_PATH, server_info.serviceType, server_info.groupPath])
+    puts server_json
+    re = @zk.create(create_path, server_json.to_s, :ephemeral => true, :sequence => true)
+    # re = @zk.create(option[:server_found_base_path] + "/" + child, option[:ip_port], :ephemeral => true, :sequence => true)
+    puts "create ephemeral path #{re} with data #{server_json} succ !!!"
     #end
   end
-  
+
 
   # Public: server found client part.
   #
-  # server_path  - The String (zk's path) to be watched.
+  # service_type - 
+  # group_path  - The String (zk's path) to be watched.
   # block - The callback to be call when the server_path to be watched changed.
   #
-  # Examples
-  #
-  #   server_found_client('/stat-service'){ | iplist, load_balance | 
-  #     puts iplist
-  #     puts load_balance
-  #   }
-  #   # => nil
-  #
-  def server_found_client(server_path, &block)
-    puts "zk server_found start watching on #{server_path}"
-    relist = @zk.children(server_path, :watch => true)
+  def server_found_client(service_type, group_path, &block)
+    watch_path = get_combined_path([SERVER_FOUND_BASE_PATH, service_type, group_path])
+    puts "zk server_found start watching on #{watch_path}"
+    relist = @zk.children(watch_path, :watch => true)
     # relist = @zk.children(server_path)
-    load_balance = @zk.get(server_path, :watch => true)[0]
-
+    load_balance = @zk.get(watch_path, :watch => true)[0]
+ 
     puts "get children #{relist} and get load_balance #{load_balance} for the first time"
-    
+
     #context[:serverlist => relist]
-    block.call(get_ip_from_server(server_path, relist),load_balance)
+    #block.call(get_ip_from_server(server_path, relist), load_balance)
+    run_block(service_type, group_path, relist, load_balance, &block)
 
-    node_subscription = @zk.register(server_path) do |event|
+    node_subscription = @zk.register(watch_path) do |event|
       puts "server found event is #{event}"
-      # get children and re-set watch
-      relist = @zk.children(server_path, :watch => true)
-      # relist = @zk.children(server_path)
-      load_balance = @zk.get(server_path, :watch => true)[0]
       if event.node_child? || event.node_changed?
+        # get children and re-set watch
+        relist = @zk.children(watch_path, :watch => true)
+        # relist = @zk.children(server_path)
+        load_balance = @zk.get(watch_path, :watch => true)[0]
         #puts relist
-        block.call(get_ip_from_server(server_path, relist), load_balance)
+        # check if server_type == thrift or http
+        # block.call()      
+        # block.call(get_ip_from_server(server_path, relist), load_balance)
+        run_block(service_type, group_path, relist, load_balance, &block)
       end
     end
   end
-  
-  # Private: Internal function, get each sub path's data.
-  #
-  # server_path  - The String to be duplicated.
-  # relist - The Integer number of times to duplicate the text.
-  #
-  # Examples
-  #
-  #   get_ip_from_server('/server-stat', ['default0000001', 'default0000002'
-  #   , 'default0000003'])
-  #   # => ['192.168.2.220:2222', '192.168.2.220:3333', '192.168.2.222:4444']
-  #
-  # Returns the ip list.
-  def get_ip_from_server(server_path, relist)
-    list = []
-    relist.each { |child|
-      #puts "get child #{child}"
-      str = @zk.get(server_path + "/" + child)[0]  
-      p str
-      list << str if str and !str.empty?
-      #p "lalalala -> #{@zk.get(server_path + "/" + child)}"
-    }
-    list.uniq
-  end
 
+  
   # Public: The serverConfig client part
   #
   # config_path  - The config_path of zk tobe watched.
   # group - The group of the service
   # block - The callback to be call when the config_path to be watched changed.
   #
-  #
-  # Examples
-  #
-  #   server_config_client('/config/server-stat', 'stat-service', 1){ |configdata|
-  #     puts configdata
-  #   }
-  #   # => nil
+  # under development
   #
   # Returns nil.
   def server_config_client(config_path, group, &block)
     puts "zk server_config start watching on #{config_path}"
-    
+
     # get server config for the first time
     version = @zk.get(config_path, :watch => true)[0]
     version = -1 if version.empty?
     version = version.to_i
 
     # call hessian to get the config data
-    configdata = REMINDER_BACKEND_SERVICE.getMapdata(version, service, group)
+    configdata = REMINDER_BACKEND_SERVICE.getMapdata(version, config_path, group)
     puts "get version for the first time configdata is #{configdata}"
     block.call(configdata)
 
@@ -155,11 +125,102 @@ class Zoo
         version = -1 if version.empty?
         version = version.to_i
         puts "server config version is #{version}"
-        
+
         # get the config data by version and service through hessian
-        configdata = REMINDER_BACKEND_SERVICE.getMapdata(version, service, group)
+        configdata = REMINDER_BACKEND_SERVICE.getMapdata(version, config_path, group)
         block.call(configdata)
       end
     end
   end
-end
+
+  private
+  def run_block(server_type, group_path, children, load_balance, &block)
+    parent_path = get_combined_path([SERVER_FOUND_BASE_PATH, server_type, group_path])
+    list = []
+    children.each { |child|
+      #puts "get child #{child}"
+      json_data = @zk.get(get_combined_path([parent_path, child]))[0]
+      puts json_data 
+      list << json_data if json_data and !json_data.empty?
+      #p "lalalala -> #{@zk.get(server_path + "/" + child)}"
+    }
+    if server_type == SERVER_TYPE_HTTP
+      block.call(http_models_generator(list.uniq), load_balance)
+    elsif server_type == SERVER_TYPE_THRIFT
+      block.call(thrift_models_generator(list.uniq), load_balance)
+    end
+  end
+  
+  def http_models_generator(jsons)
+    relist = []
+    jsons.each do |json|
+      hash = @parser.parse(json)
+      relist << server_info_hash_to_http_model(hash)
+    end
+    relist
+  end
+
+  def thrift_models_generator(jsons)
+    relist = []
+    jsons.each do |json|
+      hash = @parser.parse(json)
+      relist << server_info_hash_to_thrift_model(hash)
+    end
+    relist
+  end
+
+  def server_info_hash_to_http_model(hash)
+    HttpModel.new({ ip: hash["ip"], port: hash["port"], 
+      serviceType: hash["serviceType"], serviceName: hash["serviceName"]})
+  end
+
+  def server_info_hash_to_thrift_model(hash)
+    ThriftModel.new({ ip: hash["ip"], port: hash["port"], 
+      serviceType: hash["serviceType"], serviceName: hash["serviceName"],
+      workerSize: hash["workerSize"], selectorSize: hash["selectorSize"] })
+  end
+
+  def create_parentPath(paths)
+    create_path = ""
+    paths.each do |path|
+      create_path << "/"
+      create_path << path
+      # create path if not exists
+      re = @zk.create(create_path, '', :ephemeral => false, :sequence => false) if !@zk.exists?(create_path)
+      puts "create parent path #{re}" if !re.nil?
+    end
+  end
+
+  def get_combined_path(paths)
+    repath = ""
+    paths.each do |path|
+      repath << "/" if !path.start_with?("/")
+      repath << path
+    end
+    repath
+  end
+end
+
+  # Private: Internal function, get each sub path's data.
+  #
+  # server_path  - The String to be duplicated.
+  # relist - The Integer number of times to duplicate the text.
+  #
+  # Examples
+  #
+  #   get_ip_from_server('/server-stat', ['default0000001', 'default0000002'
+  #   , 'default0000003'])
+  #   # => ['192.168.2.220:2222', '192.168.2.220:3333', '192.168.2.222:4444']
+  #
+  # Returns the ip list.
+  # def get_ip_from_server(server_path, relist)
+  #   list = []
+  #   relist.each { |child|
+  #     #puts "get child #{child}"
+  #     str = @zk.get(server_path + "/" + child)[0]  
+  #     p str
+  #     list << str if str and !str.empty?
+  #     #p "lalalala -> #{@zk.get(server_path + "/" + child)}"
+  #   }
+  #   list.uniq
+  # end

data/lib/reminder-client/http_model.rb

@@ -0,0 +1,30 @@
+class HttpModel
+  attr_accessor :ip, :port, :serviceType, :serviceName
+
+  DEFAULT_OPTIONS = {
+    :groupPath => nil,
+    :memberName => "default",
+    :ip => nil,
+    :port => nil,
+    :serviceType => nil,
+    :serviceName => nil,    
+  }
+
+  def initialize(options)
+    raise "initialize HttpModel error, options can not be nil." if options == nil 
+    #@options = DEFAULT_OPTIONS.merge(options)
+    @ip = options[:ip]
+    @port = options[:port]
+    @serviceType = options[:serviceType]
+    @serviceName = options[:serviceName]
+  end
+
+  def to_hash
+    {
+    :ip => @ip,
+    :port => @port,
+    :serviceType => @serviceType,
+    :serviceName => @serviceName,    
+    }
+  end
+end

data/lib/reminder-client/server_info.rb

@@ -0,0 +1,45 @@
+class ServerInfo
+  attr_accessor :groupPath, :memberName, :ip, :port, :serviceType, :serviceName, :workerSize, :selectorSize
+
+  DEFAULT_OPTIONS = {
+    :groupPath => nil,
+    :memberName => "default",
+    :ip => nil,
+    :port => nil,
+    :serviceType => nil,
+    :serviceName => nil,
+    :workerSize => nil,
+    :selectorSize => nil
+  }
+
+  def initialize(options)
+    raise "initialize ServerInfo error, options can not be nil." if options == nil 
+    #@options = DEFAULT_OPTIONS.merge(options)
+    @groupPath = options[:groupPath]
+    if options[:memberName].nil?
+      @memberName = "default" 
+    else
+      @memberName = options[:memberName]
+    end
+    @ip = options[:ip]
+    @port = options[:port]
+    @serviceType = options[:serviceType]
+    @serviceName = options[:serviceName]
+    @workerSize = options[:workerSize]
+    @selectorSize =  options[:selectorSize]
+  end
+
+  def getHash
+    {
+    :groupPath => @groupPath,
+    :memberName => @memberName,
+    :ip => @ip,
+    :port => @port,
+    :serviceType => @serviceType,
+    :serviceName => @serviceName,
+    :workerSize => @workerSize,
+    :selectorSize => @selectorSize
+    }
+  end
+  
+end

data/lib/reminder-client/thrift_model.rb

@@ -0,0 +1,34 @@
+class ThriftModel
+  attr_accessor :ip, :port, :serviceType, :serviceName, :workerSize, :selectorSize
+
+  DEFAULT_OPTIONS = {
+    :ip => nil,
+    :port => nil,
+    :serviceType => nil,
+    :serviceName => nil,
+    :workerSize => nil,
+    :selectorSize => nil    
+  }
+
+  def initialize(options)
+    raise "initialize ThriftModel error, options can not be nil." if options == nil 
+    #@options = DEFAULT_OPTIONS.merge(options)
+    @ip = options[:ip]
+    @port = options[:port]
+    @serviceType = options[:serviceType]
+    @serviceName = options[:serviceName]
+    @workerSize = options[:workerSize]
+    @selectorSize =  options[:selectorSize]
+  end
+
+  def to_hash
+    {
+    :ip => @ip,
+    :port => @port,
+    :serviceType => @serviceType,
+    :serviceName => @serviceName,
+    :workerSize => @workerSize,
+    :selectorSize => @selectorSize
+    }
+  end
+end

data/test/application2.rb

@@ -14,8 +14,13 @@ class HelloApp < Sinatra::Base
   #end
 
   get '/' do
-    "server_list -> #{$global_server_list}
-    <br>
+    "mobile_list -> #{$global_server_list[:mobile].join('<br>')}
+    <br><br>
+    
+    xserver_list -> #{$global_server_list[:xserver].join('<br>')}
+    <br><br>
+    server-stat_list -> #{$global_server_list["server-stat"].join('<br>')}
+    <br><br>
     <br>
     config -> #{$global_idservice_thrift_config}
     "

data/test/servertest.rb

@@ -25,7 +25,7 @@ class Zoo
       1000.times do
         re = @zk.create(@server_found_base_path + "/" + child, "192.168.2.2:#{rand(9999)}", :ephemeral => true, :sequence => true)
         puts "create ephemeral path #{re} "
-        sleep(rand(5))
+        sleep(rand(10))
       end
     }
     Thread.new{
@@ -33,7 +33,7 @@ class Zoo
         relist = @zk.children(@server_found_base_path)
         re = @zk.delete(@server_found_base_path+"/"+relist.pop) if !relist.empty?
         puts "delete ephemeral path #{re}"
-        sleep(rand(10))
+        sleep(rand(9))
       end
     }
   end

data/test/test.rb

@@ -1,10 +1,86 @@
 
+require 'bundler'
+Bundler.require
+
+require 'zk'
+require 'yajl'
+
+$:.unshift File.expand_path("../../lib", __FILE__)
+require "reminder-client"
+require "reminder-client/server_info"
+require "reminder-client/http_model"
+
+#zk = ZK.new('localhost:2181')
+#p zk.stat('/path').exists?
+#p zk.stat('/services').exists?
+
+
+
+serverinfo = ServerInfo.new({ groupPath:"mobile", ip:"192.23.33.123", port:"2121", serviceType:"http", serviceName:"mobile" })
+
+#p serverinfo
+
+server_json = Yajl::Encoder.encode(serverinfo.getHash)
+p server_json
+hhash = Yajl::Parser.parse(server_json)
+p hhash
+# p HttpModel.new(hhash)
+
 list = ["22","22",nil,""]
 list1 = []
 list.each{|x|
   list1 << x if x and !x.empty?
   #p x if x
 }
+
+a = nil
+a = "ddd"
+member = "default" if a.nil?
+p "  -----  >  #{member}"
+
+zoo = Zoo.new(:zk_address => "127.0.0.1:2181")
+
+zoo.server_found_server( { groupPath:"mobile", ip:"192.23.33.123", port:"2121", serviceType:"http", serviceName:"mobile" })
+
+
+# puts Zoo::SERVER_TYPE_HTTP
+zoo.server_found_client(Zoo::SERVER_TYPE_HTTP, "mobile"){ |context, _load_balance|
+  puts "http list is -#{context}-, load_balance is -#{_load_balance}-"
+}
+
+zoo.server_found_server({ groupPath:"mobile", ip:"192.23.33.123", port:"2121", serviceType:"http", serviceName:"mobile" })
+
+sleep(10)
+
+
+def server_info_hash_to_http_model(hash)
+  HttpModel.new({ ip: hash["ip"], port: hash["port"], 
+    serviceType: hash["serviceType"], serviceName: hash["serviceName"]})
+end
+
+def server_info_hash_to_thrift_model(hash)
+  ThriftModel.new({ ip: hash["ip"], port: hash["port"], 
+    serviceType: hash["serviceType"], serviceName: hash["serviceName"],
+    workerSize: hash["workerSize"], selectorSize: hash["selectorSize"] })
+end
+
+p "--------  ----- ----   ----------"
+p server_info_hash_to_http_model(hhash)
+
+def create_parentPath(paths)
+  create_path = ""
+  paths.each do|path|
+    create_path << "/"
+    create_path << path
+    # do somethings
+     p create_path
+  end
+  create_path
+end
+
+#p get_combined_path(["/","aaa","bbb","ccc"])
+#p create_parentPath(["aaa",'bbb','cc'])
+
 #p list1.uniq
 #p list1
 
@@ -89,7 +165,11 @@ p '---------------'
 # html = open("www.baidu.com").read
 # p html
 
-require 'hessian2'
-Z_SERVICE = Hessian2::Client.new("http://192.168.5.100:8080/reminder-backend/hessian/requestconfigdataservice")
+#require 'hessian2'
+#Z_SERVICE = Hessian2::Client.new("http://192.168.5.100:8080/reminder-backend/hessian/requestconfigdataservice")
+#Z_SERVICE = Hessian2::Client.new("http://localhost:8080/reminder-backend/hessian/requestconfigdataservice")
+
+#p Z_SERVICE.getMapdata(1, "xservice", "0")
+
+#semaphore = Mutex.new
 
-p Z_SERVICE.getMapdata(1, "xservice", "0")

data/test/test1.rb

@@ -0,0 +1,21 @@
+#require 'bundler'
+#Bundler.require
+
+require File.expand_path("../application",__FILE__)
+$:.unshift File.expand_path("../../lib", __FILE__)
+$:.unshift File.expand_path("../../test", __FILE__)
+
+#require '../../lib/server_info'
+
+require "reminder-client"
+
+p ServerInfo.new({ groupPath: "groupxx", ip: "192.214.22.22" })
+
+Thread.new{
+  while true
+    p 1
+    sleep(1)
+  end
+}
+
+sleep(100)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reminder-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - caorong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zk
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.3
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 description: reminder client
 email: caorong@ximalaya.com
 executables: []
@@ -32,11 +46,15 @@ extra_rdoc_files: []
 files:
 - lib/reminder-client.rb
 - lib/reminder-client/configcenter.rb
+- lib/reminder-client/http_model.rb
+- lib/reminder-client/server_info.rb
+- lib/reminder-client/thrift_model.rb
 - test/application.rb
 - test/application1.rb
 - test/application2.rb
 - test/servertest.rb
 - test/test.rb
+- test/test1.rb
 homepage: http://www.ximalaya.com
 licenses:
 - MIT2.0
@@ -62,6 +80,7 @@ signing_key:
 specification_version: 4
 summary: A zookeeper client wrapper provide serverfound and serverconfig.
 test_files:
+- test/test1.rb
 - test/application1.rb
 - test/test.rb
 - test/servertest.rb