diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-09-25 22:45:22 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-09-26 23:49:38 +0200 |
| commit | 7459c00588580ae30d4891e8a22213150eb69ca1 (patch) | |
| tree | 5cef08aaa690ab87048a81daed6838400ffe4fd5 /server/sonar-ce/src | |
| parent | 00e284b921a3803b23fd10a74188c40e45e1f39a (diff) | |
| download | sonarqube-7459c00588580ae30d4891e8a22213150eb69ca1.tar.gz sonarqube-7459c00588580ae30d4891e8a22213150eb69ca1.zip | |
SONAR-9802 add section "CE Logging" to standalone mode of api/system/info
Diffstat (limited to 'server/sonar-ce/src')
3 files changed, 4 insertions, 4 deletions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/CeQueueModule.java b/server/sonar-ce/src/main/java/org/sonar/ce/CeQueueModule.java index 2811aa16c44..f1776dd8c78 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/CeQueueModule.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/CeQueueModule.java @@ -26,6 +26,7 @@ import org.sonar.ce.queue.InternalCeQueueImpl; import org.sonar.core.platform.Module; import org.sonar.process.systeminfo.JvmPropertiesSection; import org.sonar.process.systeminfo.JvmStateSection; +import org.sonar.server.platform.monitoring.cluster.LoggingSection; public class CeQueueModule extends Module { @Override @@ -39,6 +40,7 @@ public class CeQueueModule extends Module { CeTasksMBeanImpl.class, new JvmStateSection("Compute Engine JVM State"), new JvmPropertiesSection("Compute Engine JVM Properties"), + LoggingSection.class, // init queue state and queue processing CeQueueInitializer.class); diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java index 3cf5f769c7f..9d777bc0e7d 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java @@ -127,7 +127,6 @@ import org.sonar.server.platform.WebServerImpl; import org.sonar.server.platform.db.migration.MigrationConfigurationModule; import org.sonar.server.platform.db.migration.version.DatabaseVersion; import org.sonar.server.platform.monitoring.DbSection; -import org.sonar.server.platform.monitoring.cluster.LoggingSection; import org.sonar.server.platform.monitoring.cluster.ProcessInfoProvider; import org.sonar.server.plugins.InstalledPluginReferentialFactory; import org.sonar.server.plugins.ServerExtensionInstaller; @@ -431,8 +430,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { // system info DbSection.class, - ProcessInfoProvider.class, - LoggingSection.class); + ProcessInfoProvider.class); } else { container.add(StandaloneCeDistributedInformation.class); } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java index c10b6f94c6d..9f4b1ac07e1 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java @@ -131,7 +131,7 @@ public class ComputeEngineContainerImplTest { CONTAINER_ITSELF + 73 // level 4 + 4 // content of CeConfigurationModule - + 6 // content of CeQueueModule + + 7 // content of CeQueueModule + 4 // content of CeHttpModule + 3 // content of CeTaskCommonsModule + 4 // content of ProjectAnalysisTaskModule |