Merge remote-tracking branch 'origin/database' into pareto

NREL · Apr 30, 2022 · 62d77f3 · 62d77f3
2 parents acf6bbe + 68a300a
commit 62d77f3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/server/app/controllers/admin_controller.rb b/server/app/controllers/admin_controller.rb
@@ -83,7 +83,7 @@ def reload_database(database_file)
     if $?.exitstatus.zero?
       logger.info 'Successfully extracted uploaded database dump'
 
-      exec_str = "mongorestore --username  ENV['MONGO_USERNAME'] --password  ENV['MONGO_PASSWORD'] --authenticationDatabase admin  #{Mongoid.default_client.database.name} -h #{Mongoid.default_client.cluster.addresses[0].seed} --drop #{extract_dir}/#{Mongoid.default_client.database.name}"
+      exec_str = "mongorestore --username $MONGO_USER --password $MONGO_PASSWORD --authenticationDatabase admin --db #{Mongoid.default_client.database.name} --host #{Mongoid.default_client.cluster.addresses[0].seed} --drop #{extract_dir}/#{Mongoid.default_client.database.name}"
       `#{exec_str}`
       if $?.exitstatus.zero?
         logger.info 'Restored mongo database'
@@ -103,7 +103,7 @@ def write_and_send_data(file_prefix = 'mongodump')
     dump_dir = "#{APP_CONFIG['rails_tmp_path']}/#{file_prefix}_#{time_stamp}"
     FileUtils.mkdir_p(dump_dir)
 
-    exec_str = "mongodump --username  ENV['MONGO_USERNAME'] --password  ENV['MONGO_PASSWORD'] --authenticationDatabase admin --db #{Mongoid.default_client.database.name} --host #{Mongoid.default_client.cluster.addresses[0].seed} --out #{dump_dir}"
+    exec_str = "mongodump --username $MONGO_USER --password $MONGO_PASSWORD --authenticationDatabase admin --db #{Mongoid.default_client.database.name} --host #{Mongoid.default_client.cluster.addresses[0].seed} --out #{dump_dir}"
     `#{exec_str}`
 
     if $?.exitstatus.zero?