Commit f021f13444f727888986ea79fad36b77ca0f6ae7
1 parent
9d8e5c7e
Exists in
master
and in
1 other branch
fixing mongo.rb initializer to use mongoid 3
Showing
1 changed file
with
17 additions
and
9 deletions
Show diff stats
config/initializers/mongo.rb
... | ... | @@ -20,14 +20,22 @@ elsif ENV['HEROKU'] || ENV['USE_ENV'] |
20 | 20 | end |
21 | 21 | |
22 | 22 | Mongoid.configure do |config| |
23 | - config.master = Mongo::Connection.new( | |
24 | - settings.host, | |
25 | - settings.port | |
26 | - ).db(database_name) | |
27 | - config.master.authenticate(settings.user, settings.password) if settings.user | |
23 | + | |
24 | + hash = { | |
25 | + sessions: { | |
26 | + default: { | |
27 | + database: database_name, | |
28 | + hosts: [ "#{settings.host}:#{settings.port}" ] | |
29 | + } | |
30 | + }, | |
31 | + options: { allow_dynamic_fields: false, use_activesupport_time_zone: true, identity_map_enabled: true } | |
32 | + } | |
33 | + | |
34 | + if settings.user && settings.password | |
35 | + hash[:sessions][:default][:username] = settings.user | |
36 | + hash[:sessions][:default][:password] = settings.password | |
37 | + end | |
38 | + | |
39 | + config.load_configuration(hash) | |
28 | 40 | end |
29 | 41 | end |
30 | - | |
31 | -Mongoid.allow_dynamic_fields = false | |
32 | -Mongoid.use_activesupport_time_zone = true | |
33 | -Mongoid.identity_map_enabled = true | ... | ... |
-
mentioned in commit 74b76ef2a299cc4830d161e59af1f88658ab4e61