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

Added some missing logging around realms 

Closes elastic/elasticsearch#214

Original commit: elastic/x-pack-elasticsearch@648410ff8f
This commit is contained in:
uboness 2014-10-23 11:15:02 +02:00
parent b2ffc1d7b9
commit 9b6823683c
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/elasticsearch/shield/authc/Realms.java
View File

@ -7,6 +7,8 @@ package org.elasticsearch.shield.authc;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.inject.internal.Nullable;
import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.logging.ESLoggerFactory;
import org.elasticsearch.shield.authc.esusers.ESUsersRealm;
import org.elasticsearch.shield.authc.ldap.LdapRealm;
import org.elasticsearch.shield.authc.system.SystemRealm;
@ -19,6 +21,8 @@ import java.util.List;
*/
public class Realms {
private static final ESLogger logger = ESLoggerFactory.getLogger(Realms.class.getName());
private final Realm[] realms;
@Inject
@ -27,9 +31,11 @@ public class Realms {
List<Realm> realms = new ArrayList<>();
realms.add(system);
if (esusers != null) {
logger.info("Realm [" + esusers.type() + "] is used");
realms.add(esusers);
}
if (ldap != null) {
logger.info("Realm [" + ldap.type() + "] is used");
realms.add(ldap);
}
this.realms = realms.toArray(new Realm[realms.size()]);

3
src/main/java/org/elasticsearch/shield/authc/esusers/FileUserPasswdStore.java
View File

@ -54,6 +54,9 @@ public class FileUserPasswdStore extends AbstractComponent implements UserPasswd
super(settings);
file = resolveFile(settings, env);
esUsers = parseFile(file, logger);
if (esUsers.isEmpty() && logger.isDebugEnabled()) {
logger.debug("Realm [esusers] has no users");
}
FileWatcher watcher = new FileWatcher(file.getParent().toFile());
watcher.addListener(new FileListener());
watcherService.add(watcher, ResourceWatcherService.Frequency.HIGH);