honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-23 05:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove jline from distribution to simplify it (no longer painting log levels though...)

Browse Source
This commit is contained in:
Shay Banon 2011-12-16 15:36:22 +02:00
parent 1a26ba7968
commit 367a608707
6 changed files with 3 additions and 512 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -196,14 +196,6 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>1.0</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>sigar</groupId>
<artifactId>sigar</artifactId>
@ -493,7 +485,7 @@
</data>
<data>
<src>${project.build.directory}/lib</src>
<includes>lucene*, log4j*, jline*, jna*</includes>
<includes>lucene*, log4j*, jna*</includes>
<type>directory</type>
<mapper>
<type>perm</type>

1
src/main/assemblies/common-bin.xml
View File

@ -6,7 +6,6 @@
<includes>
<include>org.apache.lucene:lucene*</include>
<include>log4j:log4j</include>
<include>jline:jline</include>
<include>net.java.dev.jna:jna</include>
</includes>
</dependencySet>

18
src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
View File

@ -26,12 +26,10 @@ import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.inject.CreationException;
import org.elasticsearch.common.inject.spi.Message;
import org.elasticsearch.common.io.FileSystemUtils;
import org.elasticsearch.common.jline.ANSI;
import org.elasticsearch.common.jna.Natives;
import org.elasticsearch.common.logging.ESLogger;
import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.common.logging.log4j.LogConfigurator;
import org.elasticsearch.common.os.OsUtils;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.env.Environment;
import org.elasticsearch.monitor.jvm.JvmInfo;
@ -44,13 +42,10 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch;
import static com.google.common.collect.Sets.newHashSet;
import static jline.ANSIBuffer.ANSICodes.attrib;
import static org.elasticsearch.common.settings.ImmutableSettings.Builder.EMPTY_SETTINGS;
/**
* A main entry point when starting from the command line.
*
*
*/
public class Bootstrap {
@ -149,11 +144,6 @@ public class Bootstrap {
bootstrap = new Bootstrap();
String pidFile = System.getProperty("es-pidfile");
// enable jline by default when running form "main" (and not on windows)
if (System.getProperty("jline.enabled") == null && !OsUtils.WINDOWS) {
System.setProperty("jline.enabled", "true");
}
boolean foreground = System.getProperty("es-foreground") != null;
// handle the wrapper system property, if its a service, don't run as a service
if (System.getProperty("wrapper.service", "XXX").equalsIgnoreCase("true")) {
@ -244,15 +234,7 @@ public class Bootstrap {
private static String buildErrorMessage(String stage, Throwable e) {
StringBuilder errorMessage = new StringBuilder("{").append(Version.CURRENT).append("}: ");
try {
if (ANSI.isEnabled()) {
errorMessage.append(attrib(ANSI.Code.FG_RED)).append(stage).append(" Failed ...").append(attrib(ANSI.Code.OFF)).append("\n");
} else {
errorMessage.append(stage).append(" Failed ...\n");
}
} catch (Throwable t) {
errorMessage.append(stage).append(" Failed ...\n");
}
if (e instanceof CreationException) {
CreationException createException = (CreationException) e;
Set<String> seenMessages = newHashSet();

381
src/main/java/org/elasticsearch/common/jline/ANSI.java
View File

@ -1,381 +0,0 @@
/*
* Licensed to ElasticSearch and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. ElasticSearch licenses this
* file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.common.jline;
import jline.ANSIBuffer;
import jline.Terminal;
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.Writer;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.HashMap;
import java.util.Map;
/**
*
*/
public class ANSI {
//
// Detection/Enabled Muck
//
/**
* Tries to detect if the current system supports ANSI.
*/
private static boolean detect() {
if (System.getProperty("jline.enabled", "false").equalsIgnoreCase("false")) {
return false;
}
boolean enabled = Terminal.getTerminal().isANSISupported();
if (!enabled) {
String force = System.getProperty(ANSI.class.getName() + ".force", "false");
enabled = Boolean.valueOf(force).booleanValue();
}
return enabled;
}
public static boolean isDetected() {
return detect();
}
private static Boolean enabled;
public static void setEnabled(final boolean flag) {
enabled = Boolean.valueOf(flag);
}
public static boolean isEnabled() {
if (enabled == null) {
enabled = Boolean.valueOf(isDetected());
}
return enabled.booleanValue();
}
//
// Code
//
public static class Code {
//
// NOTE: Some fields duplicated from jline.ANSIBuffer.ANSICodes to change access modifiers
//
public static final int OFF = 0;
public static final int BOLD = 1;
public static final int UNDERSCORE = 4;
public static final int BLINK = 5;
public static final int REVERSE = 7;
public static final int CONCEALED = 8;
public static final int FG_BLACK = 30;
public static final int FG_RED = 31;
public static final int FG_GREEN = 32;
public static final int FG_YELLOW = 33;
public static final int FG_BLUE = 34;
public static final int FG_MAGENTA = 35;
public static final int FG_CYAN = 36;
public static final int FG_WHITE = 37;
public static final int BLACK = FG_BLACK;
public static final int RED = FG_RED;
public static final int GREEN = FG_GREEN;
public static final int YELLOW = FG_YELLOW;
public static final int BLUE = FG_BLUE;
public static final int MAGENTA = FG_MAGENTA;
public static final int CYAN = FG_CYAN;
public static final int WHITE = FG_WHITE;
public static final int BG_BLACK = 40;
public static final int BG_RED = 41;
public static final int BG_GREEN = 42;
public static final int BG_YELLOW = 43;
public static final int BG_BLUE = 44;
public static final int BG_MAGENTA = 45;
public static final int BG_CYAN = 46;
public static final int BG_WHITE = 47;
/**
* A map of code names to values.
*/
private static final Map NAMES_TO_CODES;
/**
* A map of codes to name.
*/
private static final Map CODES_TO_NAMES;
static {
Field[] fields = Code.class.getDeclaredFields();
Map names = new HashMap(fields.length);
Map codes = new HashMap(fields.length);
try {
for (int i = 0; i < fields.length; i++) {
// Skip anything non-public, all public fields are codes
int mods = fields[i].getModifiers();
if (!Modifier.isPublic(mods)) {
continue;
}
String name = fields[i].getName();
Number code = (Number) fields[i].get(Code.class);
names.put(name, code);
codes.put(code, name);
}
} catch (IllegalAccessException e) {
// This should never happen
throw new Error(e);
}
NAMES_TO_CODES = names;
CODES_TO_NAMES = codes;
}
/**
* Returns the ANSI code for the given symbolic name. Supported symbolic names are all defined as
* fields in {@link ANSI.Code} where the case is not significant.
*/
public static int forName(final String name) throws IllegalArgumentException {
assert name != null;
// All names in the map are upper-case
String tmp = name.toUpperCase();
Number code = (Number) NAMES_TO_CODES.get(tmp);
if (code == null) {
throw new IllegalArgumentException("Invalid ANSI code name: " + name);
}
return code.intValue();
}
/**
* Returns the symbolic name for the given ANSI code.
*/
public static String name(final int code) throws IllegalArgumentException {
String name = (String) CODES_TO_NAMES.get(Integer.valueOf(code));
if (name == null) {
throw new IllegalArgumentException("Invalid ANSI code: " + code);
}
return name;
}
}
//
// Buffer
//
public static class Buffer {
private final StringBuffer buff = new StringBuffer();
public final boolean autoClear = true;
public String toString() {
try {
return buff.toString();
} finally {
if (autoClear) clear();
}
}
public void clear() {
buff.setLength(0);
}
public int size() {
return buff.length();
}
public Buffer append(final String text) {
buff.append(text);
return this;
}
public Buffer append(final Object obj) {
return append(String.valueOf(obj));
}
public Buffer attrib(final int code) {
if (isEnabled()) {
buff.append(ANSIBuffer.ANSICodes.attrib(code));
}
return this;
}
public Buffer attrib(final String text, final int code) {
assert text != null;
if (isEnabled()) {
buff.append(ANSIBuffer.ANSICodes.attrib(code)).append(text).append(ANSIBuffer.ANSICodes.attrib(Code.OFF));
} else {
buff.append(text);
}
return this;
}
public Buffer attrib(final String text, final String codeName) {
return attrib(text, Code.forName(codeName));
}
}
//
// Renderer
//
public static class Renderer {
public static final String BEGIN_TOKEN = "@|";
private static final int BEGIN_TOKEN_SIZE = BEGIN_TOKEN.length();
public static final String END_TOKEN = "|";
private static final int END_TOKEN_SIZE = END_TOKEN.length();
public static final String CODE_TEXT_SEPARATOR = " ";
public static final String CODE_LIST_SEPARATOR = ",";
private final Buffer buff = new Buffer();
public String render(final String input) throws RenderException {
assert input != null;
// current, prefix and suffix positions
int c = 0, p, s;
while (c < input.length()) {
p = input.indexOf(BEGIN_TOKEN, c);
if (p < 0) {
break;
}
s = input.indexOf(END_TOKEN, p + BEGIN_TOKEN_SIZE);
if (s < 0) {
throw new RenderException("Missing '" + END_TOKEN + "': " + input);
}
String expr = input.substring(p + BEGIN_TOKEN_SIZE, s);
buff.append(input.substring(c, p));
evaluate(expr);
c = s + END_TOKEN_SIZE;
}
buff.append(input.substring(c));
return buff.toString();
}
private void evaluate(final String input) throws RenderException {
assert input != null;
int i = input.indexOf(CODE_TEXT_SEPARATOR);
if (i < 0) {
throw new RenderException("Missing ANSI code/text separator '" + CODE_TEXT_SEPARATOR + "': " + input);
}
String tmp = input.substring(0, i);
String[] codes = tmp.split(CODE_LIST_SEPARATOR);
String text = input.substring(i + 1, input.length());
for (int j = 0; j < codes.length; j++) {
int code = Code.forName(codes[j]);
buff.attrib(code);
}
buff.append(text);
buff.attrib(Code.OFF);
}
//
// RenderException
//
public static class RenderException
extends RuntimeException {
public RenderException(final String msg) {
super(msg);
}
}
//
// Helpers
//
public static boolean test(final String text) {
return text != null && text.indexOf(BEGIN_TOKEN) >= 0;
}
public static String encode(final String text, final int code) {
return new StringBuffer(BEGIN_TOKEN).
append(Code.name(code)).
append(CODE_TEXT_SEPARATOR).
append(text).
append(END_TOKEN).
toString();
}
}
//
// RenderWriter
//
public static class RenderWriter extends PrintWriter {
private final Renderer renderer = new Renderer();
public RenderWriter(final OutputStream out) {
super(out);
}
public RenderWriter(final OutputStream out, final boolean autoFlush) {
super(out, autoFlush);
}
public RenderWriter(final Writer out) {
super(out);
}
public RenderWriter(final Writer out, final boolean autoFlush) {
super(out, autoFlush);
}
public void write(final String s) {
if (Renderer.test(s)) {
super.write(renderer.render(s));
} else {
super.write(s);
}
}
}
}

101
src/main/java/org/elasticsearch/common/logging/log4j/JLinePatternLayout.java
View File

@ -1,101 +0,0 @@
/*
* Licensed to ElasticSearch and Shay Banon under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. ElasticSearch licenses this
* file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.elasticsearch.common.logging.log4j;
import org.apache.log4j.Level;
import org.apache.log4j.PatternLayout;
import org.apache.log4j.helpers.FormattingInfo;
import org.apache.log4j.helpers.PatternConverter;
import org.apache.log4j.helpers.PatternParser;
import org.apache.log4j.spi.LoggingEvent;
import org.elasticsearch.common.jline.ANSI;
import java.lang.reflect.Field;
import static jline.ANSIBuffer.ANSICodes.attrib;
import static org.elasticsearch.common.jline.ANSI.Code.*;
/**
*
*/
public class JLinePatternLayout extends PatternLayout {
@Override
protected PatternParser createPatternParser(String pattern) {
try {
return new JLinePatternParser(pattern);
} catch (Throwable t) {
return super.createPatternParser(pattern);
}
}
private final static class JLinePatternParser extends PatternParser {
private JLinePatternParser(String pattern) {
super(pattern);
}
@Override
protected void addConverter(PatternConverter pc) {
try {
if (ANSI.isEnabled()) {
if (pc.getClass().getName().endsWith("BasicPatternConverter")) {
Field typeField = pc.getClass().getDeclaredField("type");
typeField.setAccessible(true);
Integer type = (Integer) typeField.get(pc);
if (type == 2002) {
pc = new ColoredLevelPatternConverter(formattingInfo);
}
}
}
} catch (Throwable t) {
// ignore
}
super.addConverter(pc);
}
private static class ColoredLevelPatternConverter extends PatternConverter {
ColoredLevelPatternConverter(FormattingInfo formattingInfo) {
super(formattingInfo);
}
public String convert(LoggingEvent event) {
if (!ANSI.isEnabled()) {
return event.getLevel().toString();
}
if (event.getLevel() == Level.FATAL) {
return attrib(FG_RED) + event.getLevel().toString() + attrib(OFF);
} else if (event.getLevel() == Level.ERROR) {
return attrib(FG_RED) + event.getLevel().toString() + attrib(OFF);
} else if (event.getLevel() == Level.WARN) {
return attrib(FG_YELLOW) + event.getLevel().toString() + ' ' + attrib(OFF);
} else if (event.getLevel() == Level.INFO) {
return attrib(FG_GREEN) + event.getLevel().toString() + ' ' + attrib(OFF);
} else if (event.getLevel() == Level.DEBUG) {
return attrib(FG_CYAN) + event.getLevel().toString() + attrib(OFF);
} else if (event.getLevel() == Level.TRACE) {
return attrib(FG_BLUE) + event.getLevel().toString() + attrib(OFF);
}
return event.getLevel().toString();
}
}
}
}

2
src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java
View File

@ -60,7 +60,7 @@ public class LogConfigurator {
.put("simple", "org.apache.log4j.SimpleLayout")
.put("html", "org.apache.log4j.HTMLLayout")
.put("pattern", "org.apache.log4j.PatternLayout")
.put("consolePattern", "org.elasticsearch.common.logging.log4j.JLinePatternLayout")
.put("consolePattern", "org.apache.log4j.PatternLayout")
.put("ttcc", "org.apache.log4j.TTCCLayout")
.put("xml", "org.apache.log4j.XMLLayout")
.immutableMap();