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

[Audit] Changed the log entry prefix configuration 

Prepended `emit_` to each of the settings to make it clearer what they're all about.

Original commit: elastic/x-pack-elasticsearch@8e648eee23
This commit is contained in:
uboness 2015-01-22 02:48:38 +01:00
parent 2c687271d4
commit 2c55d85aa5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/elasticsearch/shield/audit/logfile/LoggingAuditTrail.java
View File

@ -268,7 +268,7 @@ public class LoggingAuditTrail implements AuditTrail {
static String resolvePrefix(Settings settings) { static String resolvePrefix(Settings settings) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
if (settings.getAsBoolean("shield.audit.logfile.prefix.node_host_address", false)) { if (settings.getAsBoolean("shield.audit.logfile.prefix.emit_node_host_address", false)) {
try { try {
String address = InetAddress.getLocalHost().getHostAddress(); String address = InetAddress.getLocalHost().getHostAddress();
builder.append("[").append(address).append("] "); builder.append("[").append(address).append("] ");
@ -276,7 +276,7 @@ public class LoggingAuditTrail implements AuditTrail {
// ignore // ignore
} }
} }
if (settings.getAsBoolean("shield.audit.logfile.prefix.node_host_name", false)) { if (settings.getAsBoolean("shield.audit.logfile.prefix.emit_node_host_name", false)) {
try { try {
String hostName = InetAddress.getLocalHost().getHostName(); String hostName = InetAddress.getLocalHost().getHostName();
builder.append("[").append(hostName).append("] "); builder.append("[").append(hostName).append("] ");
@ -284,7 +284,7 @@ public class LoggingAuditTrail implements AuditTrail {
// ignore // ignore
} }
} }
if (settings.getAsBoolean("shield.audit.logfile.prefix.node_name", true)) { if (settings.getAsBoolean("shield.audit.logfile.prefix.emit_node_name", true)) {
String name = settings.get("name"); String name = settings.get("name");
if (name != null) { if (name != null) {
builder.append("[").append(name).append("] "); builder.append("[").append(name).append("] ");

6
src/test/java/org/elasticsearch/shield/audit/logfile/LoggingAuditTrailTests.java
View File

@ -106,9 +106,9 @@ public class LoggingAuditTrailTests extends ElasticsearchTestCase {
@Before @Before
public void init() throws Exception { public void init() throws Exception {
settings = ImmutableSettings.builder() settings = ImmutableSettings.builder()
.put("shield.audit.logfile.prefix.node_host_address", randomBoolean()) .put("shield.audit.logfile.prefix.emit_node_host_address", randomBoolean())
.put("shield.audit.logfile.prefix.node_host_name", randomBoolean()) .put("shield.audit.logfile.prefix.emit_node_host_name", randomBoolean())
.put("shield.audit.logfile.prefix.node_name", randomBoolean()) .put("shield.audit.logfile.prefix.emit_node_name", randomBoolean())
.build(); .build();
prefix = LoggingAuditTrail.resolvePrefix(settings); prefix = LoggingAuditTrail.resolvePrefix(settings);
} }