honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[FIX] Do not emit feature license status on shutdown 

closes elastic/elasticsearch#33

Original commit: elastic/x-pack-elasticsearch@caa49a52c5
This commit is contained in:
Areek Zillur 2014-12-05 11:29:28 -05:00
parent 108bb149bd
commit fd1011b32a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java
View File

@ -354,7 +354,7 @@ public class LicensesService extends AbstractLifecycleComponent<LicensesService>
// notify features to be disabled
for (ListenerHolder holder : registeredListeners) {
holder.disableFeatureIfNeeded();
holder.disableFeatureIfNeeded(false);
}
// clear all handlers
registeredListeners.clear();
@ -468,7 +468,7 @@ public class LicensesService extends AbstractLifecycleComponent<LicensesService>
nextScheduleFrequency = Math.min(expiryDuration, nextScheduleFrequency);
}
} else {
listenerHolder.disableFeatureIfNeeded();
listenerHolder.disableFeatureIfNeeded(true);
}
if (logger.isDebugEnabled()) {
@ -740,10 +740,12 @@ public class LicensesService extends AbstractLifecycleComponent<LicensesService>
}
}
private void disableFeatureIfNeeded() {
private void disableFeatureIfNeeded(boolean log) {
if (enabled.compareAndSet(true, false)) {
listener.onDisabled();
logger.info("license for [" + feature + "] - expired");
if (log) {
logger.info("license for [" + feature + "] - expired");
}
}
}