Skip to content
Snippets Groups Projects
Commit 0b64acae authored by farhatahmad's avatar farhatahmad Committed by Jesus Federico
Browse files

Fixed issues with maintenance mode (#683)

parent d1e50f2e
Branches
Tags release-2.2.3
No related merge requests found
...@@ -197,6 +197,6 @@ class ApplicationController < ActionController::Base ...@@ -197,6 +197,6 @@ class ApplicationController < ActionController::Base
# Manually Handle errors when application is in readonly mode # Manually Handle errors when application is in readonly mode
def handle_readonly_error def handle_readonly_error
flash.clear flash.clear
redirect_to request.referrer, flash: { alert: I18n.t("errors.maintenance.readonly") } redirect_to request.referrer || root_path, flash: { alert: I18n.t("errors.maintenance.readonly") }
end end
end end
...@@ -87,6 +87,7 @@ module ApplicationHelper ...@@ -87,6 +87,7 @@ module ApplicationHelper
def allow_greenlight_accounts? def allow_greenlight_accounts?
return Rails.configuration.allow_user_signup unless Rails.configuration.loadbalanced_configuration return Rails.configuration.allow_user_signup unless Rails.configuration.loadbalanced_configuration
return false unless @user_domain && !@user_domain.empty? && Rails.configuration.allow_user_signup return false unless @user_domain && !@user_domain.empty? && Rails.configuration.allow_user_signup
return false if @user_domain == "greenlight"
# Proceed with retrieving the provider info # Proceed with retrieving the provider info
begin begin
provider_info = retrieve_provider_info(@user_domain, 'api2', 'getUserGreenlightCredentials') provider_info = retrieve_provider_info(@user_domain, 'api2', 'getUserGreenlightCredentials')
......
...@@ -9,9 +9,12 @@ if [ "$RAILS_ENV" = "production" ] && [ "$DB_ADAPTER" = "postgresql" ]; then ...@@ -9,9 +9,12 @@ if [ "$RAILS_ENV" = "production" ] && [ "$DB_ADAPTER" = "postgresql" ]; then
fi fi
bundle exec rake db:create bundle exec rake db:create
if [ "$MAINTENANCE_MODE" != "readonly" ] && [ "$MAINTENANCE_MODE" != "full" ]; then
if ! bundle exec rake db:migrate ; then if ! bundle exec rake db:migrate ; then
export DB_MIGRATE_FAILED=1 export DB_MIGRATE_FAILED=1
fi fi
fi
bundle exec rake assets:precompile bundle exec rake assets:precompile
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment