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

default logger (when embedded in java) to log with org.elasticsearch prefix for simpler logging configruation

This commit is contained in:
kimchy 2010-10-28 23:39:37 +02:00
parent 7082593166
commit c194fa67e9
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/runConfigurations/ElasticSearch_Tests.xml
View File

@ -11,7 +11,7 @@
<option name="METHOD_NAME" value="" />
<option name="GROUP_NAME" value="" />
<option name="TEST_OBJECT" value="PACKAGE" />
<option name="VM_PARAMETERS" value="-Xmx512m" />
<option name="VM_PARAMETERS" value="-Xmx512m -Des.logger.prefix=" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="OUTPUT_DIRECTORY" value="" />

2
.idea/runConfigurations/ElasticSearch_Tests__Local_.xml
View File

@ -11,7 +11,7 @@
<option name="METHOD_NAME" value="" />
<option name="GROUP_NAME" value="" />
<option name="TEST_OBJECT" value="PACKAGE" />
<option name="VM_PARAMETERS" value="-Des.node.local=true -Xmx512m" />
<option name="VM_PARAMETERS" value="-Des.node.local=true -Xmx512m -Des.logger.prefix=" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="OUTPUT_DIRECTORY" value="" />

2
.idea/runConfigurations/ElasticSearch_Tests__compress_.xml
View File

@ -11,7 +11,7 @@
<option name="METHOD_NAME" value="" />
<option name="GROUP_NAME" value="" />
<option name="TEST_OBJECT" value="PACKAGE" />
<option name="VM_PARAMETERS" value="-Des.transport.tcp.compress=true -Xmx512m" />
<option name="VM_PARAMETERS" value="-Des.transport.tcp.compress=true -Xmx512m -Des.logger.prefix=" />
<option name="PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="OUTPUT_DIRECTORY" value="" />

1
modules/elasticsearch/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View File

@ -131,6 +131,7 @@ public class Bootstrap {
public static void main(String[] args) {
System.setProperty("es.logger.prefix", "");
Bootstrap bootstrap = new Bootstrap();
String pidFile = System.getProperty("es-pidfile");

14
modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/Loggers.java
View File

@ -40,7 +40,7 @@ import static org.elasticsearch.common.collect.Lists.*;
*/
public class Loggers {
private final static String commonPrefix = System.getProperty("es.logger.prefix", "");
private final static String commonPrefix = System.getProperty("es.logger.prefix", "org.elasticsearch.");
public static final String SPACE = " ";
@ -76,7 +76,7 @@ public class Loggers {
}
public static ESLogger getLogger(Class clazz, Settings settings, String... prefixes) {
return getLogger(getLoggerName(clazz), settings, prefixes);
return getLogger(buildClassLoggerName(clazz), settings, prefixes);
}
public static ESLogger getLogger(String loggerName, Settings settings, String... prefixes) {
@ -114,11 +114,11 @@ public class Loggers {
}
public static ESLogger getLogger(Class clazz) {
return ESLoggerFactory.getLogger(getLoggerName(clazz));
return ESLoggerFactory.getLogger(getLoggerName(buildClassLoggerName(clazz)));
}
public static ESLogger getLogger(Class clazz, String... prefixes) {
return getLogger(getLoggerName(clazz), prefixes);
return getLogger(buildClassLoggerName(clazz), prefixes);
}
public static ESLogger getLogger(String name, String... prefixes) {
@ -142,17 +142,17 @@ public class Loggers {
return ESLoggerFactory.getLogger(prefix, getLoggerName(name));
}
private static String getLoggerName(Class clazz) {
private static String buildClassLoggerName(Class clazz) {
String name = clazz.getName();
if (name.startsWith("org.elasticsearch.")) {
name = Classes.getPackageName(clazz);
}
return getLoggerName(name);
return name;
}
private static String getLoggerName(String name) {
if (name.startsWith("org.elasticsearch.")) {
return name.substring("org.elasticsearch.".length());
name = name.substring("org.elasticsearch.".length());
}
return commonPrefix + name;
}