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

Merge branch 'pr/typo' 

Original commit: elastic/x-pack-elasticsearch@73d7f06605
This commit is contained in:
David Pilato 2015-08-31 13:15:14 +02:00
parent d75a8b8d6c 88e389dd2e
commit 13d5619d4e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shield/src/main/java/org/elasticsearch/shield/action/ShieldActionFilter.java
View File

@ -38,7 +38,7 @@ import static org.elasticsearch.shield.support.Exceptions.authorizationError;
*/ */
public class ShieldActionFilter extends AbstractComponent implements ActionFilter { public class ShieldActionFilter extends AbstractComponent implements ActionFilter {
private static final Predicate<String> LICESE_EXPIRATION_ACTION_MATCHER = Privilege.HEALTH_AND_STATS.predicate(); private static final Predicate<String> LICENSE_EXPIRATION_ACTION_MATCHER = Privilege.HEALTH_AND_STATS.predicate();
private final AuthenticationService authcService; private final AuthenticationService authcService;
private final AuthorizationService authzService; private final AuthorizationService authzService;
@ -79,7 +79,7 @@ public class ShieldActionFilter extends AbstractComponent implements ActionFilte
A functional requirement - when the license of shield is disabled (invalid/expires), shield will continue A functional requirement - when the license of shield is disabled (invalid/expires), shield will continue
to operate normally, except all read operations will be blocked. to operate normally, except all read operations will be blocked.
*/ */
if (!licenseEnabled && LICESE_EXPIRATION_ACTION_MATCHER.apply(action)) { if (!licenseEnabled && LICENSE_EXPIRATION_ACTION_MATCHER.apply(action)) {
logger.error("blocking [{}] operation due to expired license. Cluster health, cluster stats and indices stats \n" + logger.error("blocking [{}] operation due to expired license. Cluster health, cluster stats and indices stats \n" +
"operations are blocked on shield license expiration. All data operations (read and write) continue to work. \n" + "operations are blocked on shield license expiration. All data operations (read and write) continue to work. \n" +
"If you have a new license, please update it. Otherwise, please reach out to your support contact.", action); "If you have a new license, please update it. Otherwise, please reach out to your support contact.", action);