Merge pull request #7 from JustinAiken/feature/single_socket

Change to use a single socket, to avoid fd sockets leaking…

CHANGELOG.md

@@ -1,3 +1,6 @@
+# feature/single_socket
+  * Use a single UDP Socket
+
 # 0.0.2
   * BUGFIX: Log location relative to `Adhearsion.root`
 

adhearsion-stats.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency %q<adhearsion>, ["~> 2.1"]
-  s.add_runtime_dependency %q<statsd-ruby>
+  s.add_runtime_dependency %q<justinaiken-statsd>
 
   s.add_development_dependency %q<coveralls>, ['>= 0']
   s.add_development_dependency %q<bundler>, ["~> 1.0"]

lib/adhearsion-stats.rb

@@ -1,5 +1,6 @@
 module AdhearsionStats; end
 
 require "adhearsion-stats/version"
+require "adhearsion-stats/stactor"
 require "adhearsion-stats/metrics_logger"
 require "adhearsion-stats/plugin"

lib/adhearsion-stats/plugin.rb

@@ -17,9 +17,10 @@ class Plugin < Adhearsion::Plugin
     init :statsd do
       AdhearsionStats.setup_logger if Adhearsion.config.statsd.log_metrics
 
-      AdhearsionStats.statsd = Statsd.new Adhearsion.config.statsd.host, Adhearsion.config.statsd.port
-      AdhearsionStats.loaded = true
+      statsd = Statsd.new Adhearsion.config.statsd.host, Adhearsion.config.statsd.port, UDPSocket.new
+      AdhearsionStats.statsd = AdhearsionStats::Stactor.new statsd
 
+      AdhearsionStats.loaded = true
       logger.info "Adhearsion-Stats has been loaded"
     end
   end

lib/adhearsion-stats/stactor.rb

@@ -0,0 +1,19 @@
+module AdhearsionStats
+  class Stactor
+    include Celluloid
+
+    attr_accessor :statsd
+
+    def initialize(statsd)
+      @statsd = statsd
+    end
+
+    def send_stat(meth, *args, &blk)
+      statsd.send meth, *args, &blk
+    end
+
+    def method_missing(meth, *args, &blk)
+      self.async.send_stat meth, *args, &blk
+    end
+  end
+end

spec/adhearsion-stats/plugin_spec.rb

@@ -22,9 +22,10 @@
     end
 
     it "sets init variables" do
-      subject.statsd.should be_an_instance_of Statsd
-      subject.statsd.host.should == "127.0.0.1"
-      subject.statsd.port.should == 8125
+      subject.statsd.should be_an_instance_of AdhearsionStats::Stactor
+      subject.statsd.statsd.should be_an_instance_of Statsd
+      subject.statsd.statsd.host.should == "127.0.0.1"
+      subject.statsd.statsd.port.should == 8125
 
       subject.metrics_logger.should be_an_instance_of AdhearsionStats::MetricsLogger
       subject.loaded.should be_true