leela_client 0.0.5 → 1.0.0

data/lib/leela_client.rb

@@ -20,5 +20,3 @@ require "leela_client/metrics"
 require "leela_client/ring"
 require "leela_client/transport"
 require "leela_client/version"
-
-module LeelaClient; end

data/lib/leela_client/api.rb

@@ -24,11 +24,10 @@ module LeelaClient
 
     def transport(servers)
       servers = servers.map do |addr|
-        host, port = addr.split(":", 2)
-        [Resolv.getaddress(host), (port || 6968).to_i]
+        [Resolv.getaddress(addr), addr]
       end
 
-      UDPTransport.new MD5Ring.from_list(servers)
+      Transport.new(MD5Ring.from_list(servers))
     end
   end
 end

data/lib/leela_client/metrics.rb

@@ -23,7 +23,7 @@ module LeelaClient
 
     def serialize
       size  = @key.size
-      now   = @timestamp.to_f.to_s
+      time  = @timestamp.to_f.to_s
       if (@value.integer?)
         value = @value.to_f.to_s
       elsif (@value.nan?)
@@ -36,7 +36,12 @@ module LeelaClient
         value = @value.to_s
       end
 
-      "#{@type} #{size}|#{@key} #{value} #{now};"
+      "#{@type} #{size}|#{@key} #{value} #{time};"
+    end
+
+    def serialize_json
+      time = @timestamp.to_f.to_s
+      {:name => @key, :type => @type, :value => @value, :timestamp => time}
     end
 
     def size

data/lib/leela_client/transport.rb

@@ -14,12 +14,70 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+require "cgi"
+require "net/http"
+require "json"
+
 module LeelaClient
-  class UDPTransport
-    MAXPAYLOAD = 1472
+
+  class Transport
 
     def initialize(ring)
       @ring = ring
+    end
+
+    def send(metrics, opts={:method => :udp})
+      if (opts[:method] == :http)
+        HTTPTransport.new(@ring, opts).send(metrics)
+      elsif (opts[:method] == :udp)
+        UDPTransport.new(@ring, opts).send(metrics)
+      else
+        raise(RuntimeError.new "unknown method: #{opts[:method]}")
+      end
+    end
+  end
+
+  class HTTPTransport
+
+    def initialize(ring, opts)
+      @ring = ring
+      @opts = opts
+    end
+
+    def send(metrics)
+      sent  = 0
+      proto = @opts[:ssl] ? "https" : "http"
+      port  = @opts[:port] || (opts[:ssl] ? 443 : 80)
+      LeelaClient::LoadBalancer.group(@ring, metrics).each do |addr, ms|
+        ms.each do |m|
+          uri = URI("#{proto}://#{addr[1]}:#{port}/v1/" + ::CGI::escape(m.key))
+          res = ::Net::HTTP.start(addr[1],
+                                  uri.port,
+                                  :use_ssl      => uri.scheme == "https",
+                                  :open_timeout => @opts[:timeout] || 5,
+                                  :read_timeout => @opts[:timeout] || 5,
+                                  :ssl_timeout  => @opts[:timeout] || 5) do |http|
+            req              = ::Net::HTTP::Post.new(uri.path)
+            req.body         = ::JSON::dump(m.serialize_json)
+            req.content_type = "application/json"
+            http.request(req)
+          end
+          if (res.code.to_i == 201)
+            sent += 1
+          end
+        end
+      end
+      return(sent)
+    end
+  end
+
+  class UDPTransport
+    MAXPAYLOAD   = 1472
+    DEFAULT_PORT = 6968
+
+    def initialize(ring, opts)
+      @ring = ring
+      @opts = opts
       @sock = UDPSocket.new
     end
 
@@ -28,12 +86,14 @@ module LeelaClient
     end
 
     def send(metrics)
+      sent = 0
       LeelaClient::LoadBalancer.group_limit(@ring, metrics, MAXPAYLOAD).each do |addr, mms|
         mms.each do |ms|
-          sent = @sock.send(serialize_list(ms), 0, addr[0], addr[1])
-          raise if (sent > MAXPAYLOAD)
+          @sock.send(serialize_list(ms), 0, addr[0], @opts[:port] || DEFAULT_PORT)
+          sent += ms.size # yeah, hopefully!
         end
       end
+      return(sent)
     end
   end
 end

data/lib/leela_client/version.rb

@@ -1,3 +1,6 @@
 module LeelaClient
-  VERSION = "0.0.5"
+  VERSION = "1.0.0"
+  MAJOR   = 1
+  MINOR   = 0
+  PATCH   = 0
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leela_client
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies: []
 description: A client for leela server
 email:
@@ -20,13 +20,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ./lib/leela_client.rb
+- ./lib/leela_client/metrics.rb
+- ./lib/leela_client/ring.rb
+- ./lib/leela_client/api.rb
 - ./lib/leela_client/version.rb
 - ./lib/leela_client/transport.rb
-- ./lib/leela_client/api.rb
-- ./lib/leela_client/ring.rb
 - ./lib/leela_client/lb.rb
-- ./lib/leela_client/metrics.rb
-- ./lib/leela_client.rb
 homepage: https://github.com/locaweb/leela-client
 licenses: []
 post_install_message: 
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A client for leela server