moved options to defaults.rb, do not start the tcp acceptor by default (36a41b94) · Commits · github_fork / Clip

fnordmetric-core/lib/fnordmetric.rb

+1 −14

Original line number	Diff line number	Diff line
		@@ -51,20 +51,7 @@ module FnordMetric
		end

		def self.default_options(opts = {})
		{
		:redis_url => "redis://localhost:6379",
		:redis_prefix => "fnordmetric",
		:inbound_stream => ["0.0.0.0", "1337"],
		:inbound_protocol => :tcp,
		:web_interface => ["0.0.0.0", "4242"],
		:web_interface_server => "thin",
		:start_worker => true,
		:print_stats => 3,
		:event_queue_ttl => 120,
		:event_data_ttl => 36002430,
		:session_data_ttl => 36002430,
		:default_flush_interval => 10
		}.merge(opts)
		FnordMetric::DEFAULT_OPTIONS.merge(opts)
		end

		def self.log(msg)

+15 −0

Original line number	Diff line number	Diff line
		@@ -5,3 +5,18 @@ FnordMetric::DEFAULT_PROC = lambda{ \|arg\| }
		FnordMetric::TICKS = lambda{ \|tick, span\| [tick, 60, 300, 1200, 3600, 86400]
		.select{ \|t\| (t >= tick) && ((span/t) > 5) }
		.uniq }

		FnordMetric::DEFAULT_OPTIONS = {
		:redis_url => "redis://localhost:6379",
		:redis_prefix => "fnordmetric",
		:inbound_stream => nil,
		:inbound_protocol => nil,
		:web_interface => ["0.0.0.0", "4242"],
		:web_interface_server => "thin",
		:start_worker => true,
		:print_stats => 3,
		:event_queue_ttl => 120,
		:event_data_ttl => 36002430,
		:session_data_ttl => 36002430,
		:default_flush_interval => 10
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -160,7 +160,7 @@ class FnordMetric::Namespace

		def build_widget(opts)
		_gauges = [opts[:gauges]].flatten.map do \|g\|
		@gauges[g] \|\| ZeroConfigGauge.new(g, self)
		@gauges[g] \|\| FnordMetric::ZeroConfigGauge.new(g, self)
		end
		widget_klass = "FnordMetric::#{opts.fetch(:type).to_s.capitalize}Widget"
		widget_klass.constantize.new(opts.merge(:gauges => _gauges))