Skip to content

Commit

Permalink
Merge pull request #179 from zendesk/bquorning.stop-inspecting-config…
Browse files Browse the repository at this point in the history
…urations

Stop inspecting configurations, keys are enough
  • Loading branch information
bquorning authored May 24, 2018
2 parents f7dca26 + 01e9c69 commit ffa35a4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/active_record_shards/connection_switcher.rb
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def current_shard_id

def shard_names
unless config = configurations[shard_env]
raise "Did not find #{shard_env} in configurations, did you forget to add it to your database config? (configurations: #{configurations.inspect})"
raise "Did not find #{shard_env} in configurations, did you forget to add it to your database config? (configurations: #{configurations.keys.inspect})"
end
unless config.fetch(SHARD_NAMES_CONFIG_KEY, []).all? { |shard_name| shard_name.is_a?(Integer) }
raise "All shard names must be integers: #{config[SHARD_NAMES_CONFIG_KEY].inspect}."
Expand All @@ -157,7 +157,7 @@ def switch_connection(options)

if options.key?(:shard)
unless configurations[shard_env]
raise "Did not find #{shard_env} in configurations, did you forget to add it to your database config? (configurations: #{configurations.inspect})"
raise "Did not find #{shard_env} in configurations, did you forget to add it to your database config? (configurations: #{configurations.keys.inspect})"
end
current_shard_selection.shard = options[:shard]
end
Expand Down

0 comments on commit ffa35a4

Please sign in to comment.