recognizer 0.1.2 → 0.1.3

data/lib/recognizer/amqp.rb

@@ -21,7 +21,7 @@ module Recognizer
         amqp.start
 
         exchange = amqp.exchange(exchange_name, :type => exchange_type.to_sym, :durable => durable)
-        queue = amqp.queue("recognizer")
+        queue    = amqp.queue("recognizer")
         queue.bind(exchange, :key => routing_key)
 
         Thread.abort_on_exception = true
@@ -31,6 +31,7 @@ module Recognizer
           queue.subscribe do |message|
             payload         = message[:payload]
             msg_routing_key = message[:routing_key] || message[:delivery_details][:routing_key]
+
             lines = payload.split("\n")
             lines.each do |line|
               line = line.strip

data/lib/recognizer/librato.rb

@@ -31,7 +31,7 @@ module Recognizer
               begin
                 librato.submit
               rescue => error
-                logger.error("Encountered an error when flushing metrics to Librato: " + error.to_s)
+                logger.error("Encountered an error when flushing metrics to Librato :: #{error}")
               end
             end
             logger.info("Successfully flushed metrics to Librato")
@@ -57,19 +57,30 @@ module Recognizer
         loop do
           graphite_formated = carbon_queue.pop
           begin
-            path, value, timestamp = graphite_formated.split(" ").inject([]) do |result, part|
-              result << (result.empty? ? part.split(".") : Float(part).pretty)
-              result
+            parts = graphite_formated.split("\s")
+
+            unless parts.first =~ /^[A-Za-z0-9\._-]*$/
+              raise "metric name must only consist of alpha-numeric characters, periods, underscores, and dashes"
+            end
+            unless parts.first.size <= 63
+              raise "metric name must be 63 or fewer characters"
             end
-            source = get_source.call(path)
+
+            path      = parts.shift.split(".")
+            value     = Float(parts.shift).pretty
+            timestamp = Float(parts.shift).pretty
+            source    = get_source.call(path)
+
             path.delete(source)
+
             metric = {path.join(".") => {:value => value, :measure_time => timestamp, :source => source}}
+
             mutex.synchronize do
-              logger.info("Adding metric to queue: #{metric.inspect}")
+              logger.info("Adding metric to queue :: #{metric.inspect}")
               librato.add(metric)
             end
-          rescue ArgumentError
-            logger.info("Invalid metric: #{graphite_formated}")
+          rescue => error
+            logger.info("Invalid metric :: #{graphite_formated} :: #{error}")
           end
         end
       end

data/lib/recognizer/tcp.rb

@@ -15,7 +15,7 @@ module Recognizer
       threads = options[:tcp][:threads] || 20
       port    = options[:tcp][:port]    || 2003
 
-      tcp_server = TCPServer.new("0.0.0.0", port)
+      tcp_server      = TCPServer.new("0.0.0.0", port)
       tcp_connections = Queue.new
 
       Thread.abort_on_exception = true
@@ -35,6 +35,7 @@ module Recognizer
                   end
                 end
               rescue Timeout::Error
+                logger.warn("TCP -- A connection has timed out")
                 connection.close
               end
             end

data/lib/recognizer/version.rb

@@ -1,3 +1,3 @@
 module Recognizer
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: recognizer
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Sean Porter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-21 00:00:00 -07:00
+date: 2012-03-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency