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

Fix license log message levels 

Now we log license expiry, invalid and grace message as warn and log license valid message as debug

closes elastic/elasticsearch#2230

Original commit: elastic/x-pack-elasticsearch@569c169136
This commit is contained in:
Areek Zillur 2016-05-15 20:45:10 -04:00
parent 946cbfb997
commit 81e14c5617
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java
View File

@ -515,7 +515,7 @@ public class LicensesService extends AbstractLifecycleComponent<LicensesService>
logger.debug("notifying [{}] listeners", registeredLicensees.size()); logger.debug("notifying [{}] listeners", registeredLicensees.size());
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
if (license.issueDate() > now) { if (license.issueDate() > now) {
logger.info("license [{}] - invalid", license.uid()); logger.warn("license [{}] - invalid", license.uid());
return; return;
} }
long expiryDuration = license.expiryDate() - now; long expiryDuration = license.expiryDate() - now;
@ -523,7 +523,7 @@ public class LicensesService extends AbstractLifecycleComponent<LicensesService>
for (InternalLicensee licensee : registeredLicensees) { for (InternalLicensee licensee : registeredLicensees) {
licensee.onChange(license, LicenseState.ENABLED); licensee.onChange(license, LicenseState.ENABLED);
} }
logger.info("license [{}] - valid", license.uid()); logger.debug("license [{}] - valid", license.uid());
final TimeValue delay = TimeValue.timeValueMillis(expiryDuration); final TimeValue delay = TimeValue.timeValueMillis(expiryDuration);
// cancel any previous notifications // cancel any previous notifications
cancelNotifications(expiryNotifications); cancelNotifications(expiryNotifications);
@ -537,7 +537,7 @@ public class LicensesService extends AbstractLifecycleComponent<LicensesService>
for (InternalLicensee licensee : registeredLicensees) { for (InternalLicensee licensee : registeredLicensees) {
licensee.onChange(license, LicenseState.GRACE_PERIOD); licensee.onChange(license, LicenseState.GRACE_PERIOD);
} }
logger.info("license [{}] - grace", license.uid()); logger.warn("license [{}] - grace", license.uid());
final TimeValue delay = TimeValue.timeValueMillis(expiryDuration + gracePeriodDuration.getMillis()); final TimeValue delay = TimeValue.timeValueMillis(expiryDuration + gracePeriodDuration.getMillis());
// cancel any previous notifications // cancel any previous notifications
cancelNotifications(expiryNotifications); cancelNotifications(expiryNotifications);
@ -551,7 +551,7 @@ public class LicensesService extends AbstractLifecycleComponent<LicensesService>
for (InternalLicensee licensee : registeredLicensees) { for (InternalLicensee licensee : registeredLicensees) {
licensee.onChange(license, LicenseState.DISABLED); licensee.onChange(license, LicenseState.DISABLED);
} }
logger.info("license [{}] - expired", license.uid()); logger.warn("license [{}] - expired", license.uid());
} }
if (!license.equals(currentLicense.get())) { if (!license.equals(currentLicense.get())) {
currentLicense.set(license); currentLicense.set(license);