opendev/gerrit
Code Issues Proposed changes

Better logging of plugin version on load, unload and reload

Browse Source 
When a plugin is reloaded explicitly by the user, it makes more sense
to log the version that was newly loaded than the version that is
currently running and will be replaced.

Add a separate log on unload to explicitly show the version that is
being unloaded.

When a plugin is loaded or reloaded by the plugin scanner, log the new
version that has been loaded.

Change-Id: Iebee78bde188db15a495b55c32b4ba8c458b2d37
This commit is contained in:
David Pursehouse
2015-05-21 15:24:21 +09:00
parent 50514a4924
commit ac0449e6c5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
View File

@@ -217,7 +217,8 @@ public class PluginLoader implements LifecycleListener {
private synchronized void unloadPlugin(Plugin plugin) {
persistentCacheFactory.onStop(plugin);
String name = plugin.getName();
log.info(String.format("Unloading plugin %s", name));
log.info(String.format("Unloading plugin %s, version %s",
name, plugin.getVersion()));
plugin.stop(env);
env.onStopPlugin(plugin);
running.remove(name);
@@ -355,7 +356,9 @@ public class PluginLoader implements LifecycleListener {
String name = active.getName();
try {
log.info(String.format("Reloading plugin %s", name));
runPlugin(name, active.getSrcFile(), active);
Plugin newPlugin = runPlugin(name, active.getSrcFile(), active);
log.info(String.format("Reloaded plugin %s, version %s",
newPlugin.getName(), newPlugin.getVersion()));
} catch (PluginInstallException e) {
log.warn(String.format("Cannot reload plugin %s", name), e.getCause());
throw e;
@@ -395,14 +398,14 @@ public class PluginLoader implements LifecycleListener {
}
if (active != null) {
log.info(String.format("Reloading plugin %s, version %s",
active.getName(), active.getVersion()));
log.info(String.format("Reloading plugin %s", active.getName()));
}
try {
Plugin loadedPlugin = runPlugin(name, path, active);
if (active == null && !loadedPlugin.isDisabled()) {
log.info(String.format("Loaded plugin %s, version %s",
if (!loadedPlugin.isDisabled()) {
log.info(String.format("%s plugin %s, version %s",
active == null ? "Loaded" : "Reloaded",
loadedPlugin.getName(), loadedPlugin.getVersion()));
}
} catch (PluginInstallException e) {