FIX ci db bug

This commit is contained in:
Jasder
2020-09-18 15:46:36 +08:00
parent b74d43083e
commit 0467119605
4 changed files with 29 additions and 17 deletions

View File

@@ -1,4 +1,6 @@
class Ci::BaseController < ApplicationController
include Ci::DbConnectable
before_action :require_login
before_action :connect_to_ci_database
@@ -44,20 +46,4 @@ class Ci::BaseController < ApplicationController
end
end
# Dynamically sets the database connection.
def connect_to_ci_database
db_config = Rails.configuration.database_configuration[Rails.env]["ci_server_db"]
return render_error('ci database config missing') if db_config.blank?
req_params = {
host: db_config["host"],
username: db_config['username'],
password: db_config['password'],
port: db_config['port'],
database: "#{current_user.login}_#{db_config['database']}"
}
db_params = Ci::Database.get_connection_params(req_params)
Ci::Database.set_connection(db_params)
end
end