dawanda-statsd-client 0.1.5 → 0.1.6

data/Rakefile

@@ -12,11 +12,11 @@ require 'rake'
 require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "statsd-client"
-  gem.homepage = "http://github.com/tomtaylor/statsd-client"
+  gem.name = "dawanda-statsd-client"
+  gem.homepage = "http://github.com/dawanda/statsd-client"
   gem.license = "MIT"
   gem.summary = "Client for statds"
-  gem.description = %Q{TODO: longer description of your gem}
+  gem.description = %Q{A Ruby client for statsd}
   gem.email = "tom@tomtaylor.co.uk"
   gem.authors = ["Tom Taylor"]
 end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.6

data/bin/statsd-send

@@ -25,9 +25,6 @@ BANNER
   opts.on('--by x','Value for inc/dec') do |value|
     options[:by] = value.to_i
   end
-  opts.on('--host x', 'Use this host, when reporting') do |host|
-    options[:host] = host
-  end
 end.parse!
   
 command, metric, value = ARGV[0..2]

data/dawanda-statsd-client.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dawanda-statsd-client}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Taylor"]

data/lib/statsd/client.rb

@@ -5,14 +5,26 @@ require 'yaml'
 class Statsd
   class << self 
     def increment(metric, options={})
-      value = options.is_a?(Fixnum) ? options : (options[:by] || 1)
-      client.update_stats(metric, value*factor, (options[:sample_rate] || 1))
+      if options.is_a?(Fixnum)
+        value = options
+        sample_rate = 1
+      else
+        value = (options[:by] || 1)
+        sample_rate = (options[:sample_rate] || 1)
+      end
+      client.update_stats(metric, value*factor, sample_rate)
     end
     alias_method :inc, :increment
   
     def decrement(metric, options={})
-      value = options.is_a?(Fixnum) ? options : (options[:by] || 1)
-      client.update_stats(metric, value*factor*(-1), (options[:sample_rate] || 1))
+      if options.is_a?(Fixnum)
+        value = options
+        sample_rate = 1
+      else
+        value = (options[:by] || 1)
+        sample_rate = (options[:sample_rate] || 1)
+      end
+      client.update_stats(metric, value*factor*(-1), sample_rate)
     end
     alias_method :dec, :decrement
 
@@ -23,7 +35,7 @@ class Statsd
     
     def client
       return Statsd::DummyClient if deactivated?
-      @client ||= Statsd::Client.new(host, port)
+      @client ||= Statsd::Client.new(host, port, tcp?)
     end
   
     def config
@@ -42,6 +54,10 @@ class Statsd
     def port
       config['port'] || 8125
     end
+
+    def tcp?
+      config['tcp']
+    end
   
     # statds reports with default configs 1/10 of actual value
     def factor
@@ -64,14 +80,15 @@ class Statsd
   
   class Client
     VERSION = File.read( File.join(File.dirname(__FILE__),'..', '..', 'VERSION') ).strip
-    attr_reader :host, :port
+    attr_reader :host, :port, :tcp
 
     # Initializes a Statsd client.
     #
     # @param [String] host
     # @param [Integer] port
-    def initialize(host = 'localhost', port = 8125)
-      @host, @port = host, port
+    # @param [Boolean] tcp
+    def initialize(host = 'localhost', port = 8125, tcp = false)
+      @host, @port, @tcp = host, port, tcp
     end
 
     # Sends timing statistics.
@@ -123,6 +140,7 @@ class Statsd
     private
 
     def send(data, sample_rate = 1)
+      #puts "sending #{data} with sample #{sample_rate}"
       sampled_data = {}
       
       if sample_rate < 1
@@ -135,12 +153,20 @@ class Statsd
         sampled_data = data
       end
 
-      socket = UDPSocket.new
-
+      if self.tcp
+        socket = TCPSocket.new( self.host, self.port)
+      else
+        socket = UDPSocket.new
+      end
+      
       begin
         sampled_data.each do |k,v|
           message = [k,v].join(':')
-          socket.send(message, 0, self.host, self.port)
+          if self.tcp
+            socket.send(message, 0)
+          else
+            socket.send(message, 0, self.host, self.port)            
+          end
         end
       rescue Exception => e
         puts "Unexpected error: #{e}"

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
-require 'statsd-client'
+require 'statsd/client'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dawanda-statsd-client
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Tom Taylor