fnordmetric 0.7.5 → 0.9.7

data/lib/fnordmetric/worker.rb

@@ -1,44 +1,39 @@
 class FnordMetric::Worker
 
-  def initialize(namespaces, opts)        
-    @namespaces = {}
-    @opts = opts
-    configure(namespaces)
-  end
+  def initialize
+    @namespaces = FnordMetric.namespaces
+    @opts = FnordMetric.options
 
-  def ready!
-    @redis = EM::Hiredis.connect(@opts[:redis_url])
-    tick
+    FnordMetric.register(self)
   end
 
-  def configure(namespaces)   
-    namespaces.each do |key, block|
-      @namespaces[key] = FnordMetric::Namespace.new(key, @opts.clone)
-      @namespaces[key].instance_eval(&block)
-    end
+  def initialized
+    FnordMetric.log("worker started")
+    EM.next_tick(&method(:tick))
   end
 
   def tick
-    @redis.blpop(queue_key, 1).callback do |list, event_id|           
+    redis.blpop(queue_key, 1).callback do |list, event_id|
       EM.next_tick(&method(:tick))
       if event_id
-        @redis.get(event_key(event_id)).callback do |event_data|                     
-          process_event(event_id, event_data) if event_data        
+        redis.get(event_key(event_id)).callback do |event_data|
+          process_event(event_id, event_data) if event_data
           FnordMetric.log("event_lost: event_data not found for event-id '#{event_id}' - maybe expired?") unless event_data
-          @redis.hincrby(stats_key, :events_processed, 1)
+          redis.hincrby(stats_key, :events_processed, 1)
         end
       end
     end
   end
 
   def process_event(event_id, event_data)
-    EM.defer do      
-      parse_json(event_data).tap do |event|                
+    EM.next_tick do
+      event = parse_json(event_data)
+      if event
         event[:_time] ||= Time.now.to_i
         event[:_eid] = event_id
         announce_event(event)
-        publish_event(event)        
-        expire_event(event_id)       
+        publish_event(event)
+        expire_event(event_id)
       end
     end
   end
@@ -59,16 +54,16 @@ class FnordMetric::Worker
     [@opts[:redis_prefix], 'stats'].join("-")
   end
 
-  def announce_event(event)   
-    namespace(event[:_namespace]).ready!(@redis).announce(event)
+  def announce_event(event)
+    namespace(event[:_namespace]).ready!(redis).announce(event)
   end
 
   def expire_event(event_id)
-    @redis.expire(event_key(event_id), @opts[:event_data_ttl])
+    redis.expire(event_key(event_id), @opts[:event_data_ttl])
   end
 
   def publish_event(event)    
-    @redis.publish(pubsub_key, event[:_eid])    
+    redis.publish(pubsub_key, event.to_json)
   end
 
   def namespace(key)
@@ -79,6 +74,12 @@ class FnordMetric::Worker
     event = Yajl::Parser.new(:symbolize_keys => true).parse(data)
     event[:_namespace] = event[:_namespace].to_sym if event[:_namespace]
     event
+  rescue Yajl::ParseError => e
+    FnordMetric.error "invalid json: #{e.to_s}"; false
+  end
+
+  def redis
+    @redis ||= EM::Hiredis.connect(FnordMetric.options[:redis_url]) # FIXPAUL
   end
 
 end

data/lib/fnordmetric.rb

@@ -5,22 +5,52 @@ require "active_support/core_ext"
 require 'yajl'
 require 'sinatra/base'
 require 'haml'
+require 'json'
+require "thin"
 require 'rack/server'
+require 'rack/websocket'
 
 require "fnordmetric/ext"
 require "fnordmetric/version"
 
 module FnordMetric
 
+  @@options = nil
+  @@pool = []
+
   @@namespaces = {}
-  @@server_configuration = nil
 
   def self.namespace(key=nil, &block)
     @@namespaces[key] = block
   end
 
-  def self.server_configuration=(configuration)
-    @@server_configuration = configuration
+  def self.namespaces
+    {}.tap do |_namespaces|
+      @@namespaces.each do |key, block|
+        _namespaces[key] = FnordMetric::Namespace.new(key, options.clone)
+        _namespaces[key].instance_eval(&block)
+        _namespaces[key].instance_eval(&FnordMetric::DEFAULT_PROC)
+      end
+    end
+  end
+
+  def self.options(opts = {})
+    default_options(@@options || {}).merge(opts)
+  end
+
+  def self.options=(opts)
+    @@options = opts
+  end
+
+  def self.register(obj)
+    @@pool.push(obj)
+  end
+
+  def self.mk_redis
+    host, port = options[:redis_url].gsub("redis://", "").split(":")
+    redis_opts = { :host => host }
+    redis_opts.merge!(:port => port) if port
+    Redis.new(redis_opts)
   end
 
   def self.default_options(opts = {})
@@ -39,37 +69,14 @@ module FnordMetric
     }.merge(opts)
   end
 
-  def self.options(opts = {})
-    default_options(@@server_configuration || {}).merge(opts)
-  end
-
-  def self.start_em(opts = {})
-    EM.run do
-
-      trap("TERM", &method(:shutdown))
-      trap("INT",  &method(:shutdown))
-
-      opts = options(opts)
-      app = embedded(opts)
-
-      if opts[:web_interface]
-        server = opts[:web_interface_server].downcase
-        unless ["thin", "hatetepe"].include? server
-          raise "Need an EventMachine webserver, but #{server} isn't"
-        end
-
-        host, port = *opts[:web_interface]
-        Rack::Server.start :app => app, :server => server,
-                           :Host => host, :Port => port
-        log "listening on http://#{host}:#{port}"
-      end
-    end
-  end
-
   def self.log(msg)
     puts "[#{Time.now.strftime("%y-%m-%d %H:%M:%S")}] #{msg}"
   end
 
+  def self.error(msg)
+    log "[ERROR] #{msg}"; nil
+  end
+
   def self.error!(msg)
     raise msg if ENV['FNORDMETRIC_ENV'] == 'test'
     puts(msg); exit!
@@ -83,106 +90,69 @@ module FnordMetric
     sleep(1); run
   end
 
-  def self.shutdown
+  def self.shutdown(fnord=nil)
     log "shutting down, byebye"
     EM.stop
   end
 
-  def self.connect_redis(redis_url)
-    EM::Hiredis.connect(redis_url)
-  end
+  def self.start_em
+    EM.run do
 
-  def self.print_stats(opts, redis) # FIXME: refactor this mess
-    keys = [:events_received, :events_processed]
-    redis.llen("#{opts[:redis_prefix]}-queue") do |queue_length|
-      redis.hmget("#{opts[:redis_prefix]}-stats", *keys) do |data|
-        data_human = keys.size.times.map{|n|"#{keys[n]}: #{data[n]}"}
-        log "#{data_human.join(", ")}, queue_length: #{queue_length}"
+      trap("TERM", &method(:shutdown))
+      trap("INT",  &method(:shutdown))
+
+      EM.next_tick do
+        (@@pool || []).map(&:initialized)
       end
+
     end
   end
 
-  def self.standalone
-    require "fnordmetric/logger"
-    require "fnordmetric/standalone"
+  def self.server_configuration=(configuration)
+    puts "DEPRECATION WARNING - FIXPAUL"
+    self.options=(configuration)
   end
 
-  # returns a Rack app which can be mounted under any path.
-  # `:start_worker`   starts a worker
-  # `:inbound_stream` starts the TCP interface
-  # `:print_stats`    periodicaly prints worker stats
-  def self.embedded(opts={})
-    opts = options(opts)
-    app  = nil
-
-    if opts[:rack_app] or opts[:web_interface]
-      app = FnordMetric::App.new(@@namespaces.clone, opts)
-    end
-
-    EM.next_tick do
-      if opts[:start_worker]
-        worker = Worker.new(@@namespaces.clone, opts)
-        worker.ready!
-      end
-
-      if opts[:inbound_stream]
-        inbound_class = opts[:inbound_protocol] == :udp ? InboundDatagram : InboundStream
-        begin
-          inbound_stream = inbound_class.start(opts)
-          log "listening on #{opts[:inbound_protocol]}##{opts[:inbound_stream].join(":")}"
-        rescue
-          log "cant start #{inbound_class.name}. port in use?"
-        end
-      end
-
-      if opts[:print_stats]
-        redis = connect_redis(opts[:redis_url])
-        EM::PeriodicTimer.new(opts[:print_stats]) do
-          print_stats(opts, redis)
-        end
-      end
-    end
-
-    app
+  def self.standalone
+    puts "DEPRECATION WARNING - FIXPAUL"
+    require "fnordmetric/standalone"
+    start_em
   end
 
 end
 
-require "fnordmetric/api"
-require "fnordmetric/udp_client"
-require "fnordmetric/inbound_stream"
-require "fnordmetric/inbound_datagram"
-require "fnordmetric/worker"
-require "fnordmetric/widget"
-require "fnordmetric/timeline_widget"
-require "fnordmetric/numbers_widget"
-require "fnordmetric/bars_widget"
-require "fnordmetric/toplist_widget"
-require "fnordmetric/pie_widget"
-require "fnordmetric/html_widget"
-require "fnordmetric/namespace"
-require "fnordmetric/gauge_modifiers"
 require "fnordmetric/gauge_calculations"
-require "fnordmetric/context"
+require "fnordmetric/gauge_modifiers"
+require "fnordmetric/gauge_validations"
+require "fnordmetric/gauge_rendering"
 require "fnordmetric/gauge"
+require "fnordmetric/gauges/timeseries_gauge"
+require "fnordmetric/gauges/toplist_gauge"
+require "fnordmetric/gauges/distribution_gauge"
+require "fnordmetric/context"
+require "fnordmetric/histogram"
+require "fnordmetric/timeseries"
+require "fnordmetric/toplist"
+require "fnordmetric/namespace"
 require "fnordmetric/session"
-require "fnordmetric/app"
-require "fnordmetric/dashboard"
-require "fnordmetric/event"
-
-
-#require "fnordmetric/metric_api"
-
-
-#require "fnordmetric/cache"
-#require "fnordmetric/report"
-#require "fnordmetric/metric"
-#require "fnordmetric/average_metric"
-#require "fnordmetric/count_metric"
-#require "fnordmetric/combine_metric"
-#require "fnordmetric/sum_metric"
-#require "fnordmetric/widget"
-
-#
-#require "fnordmetric/funnel_widget"
-
+require "fnordmetric/api"
+require "fnordmetric/worker"
+require "fnordmetric/logger"
+require "fnordmetric/defaults"
+require "fnordmetric/web/web"
+require "fnordmetric/web/app_helpers"
+require "fnordmetric/web/app"
+require "fnordmetric/web/websocket"
+require "fnordmetric/web/reactor"
+require "fnordmetric/web/event"
+require "fnordmetric/web/dashboard"
+require "fnordmetric/acceptors/acceptor"
+require "fnordmetric/acceptors/tcp_acceptor"
+require "fnordmetric/acceptors/udp_acceptor"
+require "fnordmetric/widget"
+require "fnordmetric/widgets/timeseries_widget"
+require "fnordmetric/widgets/numbers_widget"
+require "fnordmetric/widgets/bars_widget"
+require "fnordmetric/widgets/toplist_widget"
+require "fnordmetric/widgets/pie_widget"
+require "fnordmetric/widgets/html_widget"