From 53019c73114de5897530ec6030b0442de84bde4f Mon Sep 17 00:00:00 2001 From: Fabrice Bellingard Date: Thu, 24 May 2012 12:22:29 +0200 Subject: [PATCH] SONAR-3218 Improve backward-compatibility for server setup WS --- .../webapp/WEB-INF/app/controllers/api/server_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/server_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/server_controller.rb index 120624abeb8..f6372f84c5a 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/server_controller.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/server_controller.rb @@ -71,7 +71,9 @@ class Api::ServerController < Api::ApiController # nor concurrent calls (this is handled directly by DatabaseMigrationManager) DatabaseMigrationManager.instance.start_migration - hash={:status => 'ok', + current_status = DatabaseMigrationManager.instance.is_sonar_access_allowed? ? "ok" : "ko" + + hash={:status => current_status, :migration_status => DatabaseMigrationManager.instance.status, :message => DatabaseMigrationManager.instance.message} respond_to do |format| -- 2.39.5