Skip to content

Commit

Permalink
Change default_port local var to cass_port per CR
Browse files Browse the repository at this point in the history
  • Loading branch information
Noah Gibbs committed Jan 31, 2013
1 parent e6a56b7 commit eb509dc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions config_v2.ru
Expand Up @@ -10,8 +10,8 @@ cassandra_servers = []
if ENV['CASSANDRA_URIS'] if ENV['CASSANDRA_URIS']
cassandra_servers = MultiJson.load(ENV['CASSANDRA_URIS']).flatten cassandra_servers = MultiJson.load(ENV['CASSANDRA_URIS']).flatten
else else
default_port = ENV["HASTUR_CASS_PORT"] || "9160" cass_port = ENV["HASTUR_CASS_PORT"] || "9160"
cassandra_servers = [ "127.0.0.1:#{default_port}" ] cassandra_servers = [ "127.0.0.1:#{cass_port}" ]
end end


use Hastur::Rack, "hastur.retrieval" use Hastur::Rack, "hastur.retrieval"
Expand Down
4 changes: 2 additions & 2 deletions lib/hastur-server/api/v2.rb
Expand Up @@ -45,8 +45,8 @@ def initialize(*args)
cass_servers = args.unshift cass_servers = args.unshift
@cassandra_uris = cass_servers.flatten @cassandra_uris = cass_servers.flatten
else else
default_port = ENV["HASTUR_CASS_PORT"] || "9160" cass_port = ENV["HASTUR_CASS_PORT"] || "9160"
@cassandra_uris = [ "127.0.0.1:#{default_port}" ] @cassandra_uris = [ "127.0.0.1:#{cass_port}" ]
end end


super(*args) super(*args)
Expand Down

0 comments on commit eb509dc

Please sign in to comment.