diff options
| author | Duarte Meneses <duarte.meneses@sonarsource.com> | 2017-10-31 15:34:49 +0100 |
|---|---|---|
| committer | Duarte Meneses <duarte.meneses@sonarsource.com> | 2017-11-01 09:46:27 +0100 |
| commit | a4210ed97f1abcdd5ed700d164e2b688c5c61016 (patch) | |
| tree | 172a5b257df36750a865b19be622fbce0af247de | |
| parent | 784829702ff22927a87b51091b82724609e6efbe (diff) | |
| download | sonarqube-a4210ed97f1abcdd5ed700d164e2b688c5c61016.tar.gz sonarqube-a4210ed97f1abcdd5ed700d164e2b688c5c61016.zip | |
SONAR-9996 Finalize installation both at startup and stopping of the server
2 files changed, 5 insertions, 3 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index e7befa67c58..ccb703b4414 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -54,6 +54,7 @@ import org.sonar.server.duplication.ws.DuplicationsParser; import org.sonar.server.duplication.ws.DuplicationsWs; import org.sonar.server.duplication.ws.ShowResponseBuilder; import org.sonar.server.edition.EditionsWsModule; +import org.sonar.server.edition.FinalizeEditionChange; import org.sonar.server.email.ws.EmailsWsModule; import org.sonar.server.es.IndexCreator; import org.sonar.server.es.IndexDefinitions; @@ -566,6 +567,9 @@ public class PlatformLevel4 extends PlatformLevel { add(TelemetryDataLoader.class); addIfStartupLeader(TelemetryDaemon.class, TelemetryClient.class); + // edition + addIfStartupLeader(FinalizeEditionChange.class); + // system info addIfCluster(WebSystemInfoModule.forClusterMode()).otherwiseAdd(WebSystemInfoModule.forStandaloneMode()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java index 9a92243526e..f8c07e82b44 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevelStartup.java @@ -20,7 +20,6 @@ package org.sonar.server.platform.platformlevel; import org.sonar.server.app.ProcessCommandWrapper; -import org.sonar.server.edition.FinalizeEditionChange; import org.sonar.server.es.IndexerStartupTask; import org.sonar.server.organization.DefaultOrganizationEnforcer; import org.sonar.server.platform.ServerLifecycleNotifier; @@ -59,8 +58,7 @@ public class PlatformLevelStartup extends PlatformLevel { IndexerStartupTask.class, RegisterMetrics.class, RegisterQualityGates.class, - RegisterRules.class, - FinalizeEditionChange.class); + RegisterRules.class); add(BuiltInQProfileLoader.class); addIfStartupLeader( BuiltInQualityProfilesUpdateListener.class, |