Repository: brooklyn-server Updated Branches: refs/heads/master acb5a68c3 -> 2c3e33b84
Adds a simple timer for brooklyn init and logs duration Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/215a6ad9 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/215a6ad9 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/215a6ad9 Branch: refs/heads/master Commit: 215a6ad9942bf1172114a1f42d8258e3852d33f6 Parents: 86070d8 Author: Mark McKenna <[email protected]> Authored: Wed Aug 23 16:33:06 2017 +0100 Committer: Mark McKenna <[email protected]> Committed: Wed Aug 23 16:33:06 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/215a6ad9/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java ---------------------------------------------------------------------- diff --git a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java b/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java index fec5f71..0e89739 100644 --- a/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java +++ b/karaf/init/src/main/java/org/apache/brooklyn/launcher/osgi/OsgiLauncher.java @@ -15,6 +15,7 @@ */ package org.apache.brooklyn.launcher.osgi; +import com.google.common.base.Stopwatch; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode; import org.apache.brooklyn.core.BrooklynVersionService; @@ -48,7 +49,7 @@ public class OsgiLauncher extends BasicLauncher<OsgiLauncher> { private static final Logger LOG = LoggerFactory.getLogger(OsgiLauncher.class); public static final String BROOKLYN_CONFIG_PID = "brooklyn"; - + private Object reloadLock = new Object(); private BrooklynVersionService brooklynVersion; @@ -97,10 +98,13 @@ public class OsgiLauncher extends BasicLauncher<OsgiLauncher> { // init-method can't find the start method for some reason, provide an alternative public void init() { synchronized (reloadLock) { + final Stopwatch startupTimer = Stopwatch.createStarted(); BrooklynShutdownHooks.resetShutdownFlag(); LOG.debug("OsgiLauncher init"); catalogInitialization(new CatalogInitialization(String.format("file:%s", defaultCatalogLocation), false, null, false)); start(); + startupTimer.stop(); + LOG.info("Brooklyn initialisation complete after {}", startupTimer.toString()); } } @@ -144,7 +148,7 @@ public class OsgiLauncher extends BasicLauncher<OsgiLauncher> { } - public void setBrooklynProperties(BrooklynProperties brooklynProperties){ + public void setBrooklynProperties(BrooklynProperties brooklynProperties) { brooklynProperties(brooklynProperties); }
