Commit a55848c7 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

Merge pull request #21 from alindeman/redis_url 

Fixes ability to override redis_url
parents 6eb87fa3 c26b6c06

lib/fnordmetric.rb

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ module FnordMetric 
  

  def self.default_options(opts)



    opts[:redis_uri] = "redis://localhost:6379"

    opts[:redis_url] ||= "redis://localhost:6379"

    opts[:redis_prefix] ||= "fnordmetric"            



    opts[:inbound_stream] ||= ["0.0.0.0", "1337"]

lib/fnordmetric/app.rb

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ class FnordMetric::App < Sinatra::Base 


  def initialize(namespaces, opts)

    @namespaces = {}

    @redis = Redis.new

    @redis = Redis.connect(:url => opts[:redis_url])

    @opts = opts

    namespaces.each do |key, block|

      @namespaces[key] = FnordMetric::Namespace.new(key, opts.clone)

lib/fnordmetric/inbound_stream.rb

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class FnordMetric::InboundStream < EventMachine::Connection 
  end



  def post_init

    @redis = Redis.new

    @redis = Redis.connect(:url => opts[:redis_url])

    @events_buffered = 0

    @streaming = true

    @buffer = ""

lib/fnordmetric/worker.rb

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ class FnordMetric::Worker 
  end



  def ready!

    @redis = EM::Hiredis.connect(@opts[:redis_uri]) 

    @redis = EM::Hiredis.connect(@opts[:redis_url])

    tick

  end

CRA Git | Maintained and supported by SUSTech CRA and CCSE