Browse Source

ES 更新

chenweida 7 years ago
parent
commit
207a1ca0f8

+ 2 - 3
common-logback-starter/src/main/java/com.yihu.base/es/buffer/BufferConsumer.java

@ -21,7 +21,7 @@ public class BufferConsumer implements Runnable {
    //消费者相关配政治
    //消费者相关配政治
    private ElasticsearchAppenderProperties elasticsearchAppenderProperties;
    private ElasticsearchAppenderProperties elasticsearchAppenderProperties;
    //格式化日志数据
    //格式化日志数据
    private PatternLayout patternLayout=new PatternLayout();
    private PatternLayout patternLayout = new PatternLayout();
    public BufferConsumer(EventBuffer eventBuffer, ElasticsearchAppenderProperties elasticsearchAppenderProperties) {
    public BufferConsumer(EventBuffer eventBuffer, ElasticsearchAppenderProperties elasticsearchAppenderProperties) {
        this.eventBuffer = eventBuffer;
        this.eventBuffer = eventBuffer;
@ -33,7 +33,7 @@ public class BufferConsumer implements Runnable {
        while (true) {
        while (true) {
            try {
            try {
                //格式格式化工具
                //格式格式化工具
                patternLayout.setPattern(elasticsearchAppenderProperties.getMessageProperties().getPattern());
                // patternLayout.setPattern(elasticsearchAppenderProperties.getMessageProperties().getPattern());
                //如果队列没数据休眠
                //如果队列没数据休眠
                if (eventBuffer.getBuffer().size() == 0) {
                if (eventBuffer.getBuffer().size() == 0) {
@ -50,7 +50,6 @@ public class BufferConsumer implements Runnable {
                        .defaultType(elasticsearchAppenderProperties.getElasticsearchProperties().getType());
                        .defaultType(elasticsearchAppenderProperties.getElasticsearchProperties().getType());
                for (ILoggingEvent obj : eventObjectList) {
                for (ILoggingEvent obj : eventObjectList) {
                    String message=patternLayout.doLayout(obj);
                    Index index = new Index.Builder(obj.getFormattedMessage()).build();
                    Index index = new Index.Builder(obj.getFormattedMessage()).build();
                    bulk.addAction(index);
                    bulk.addAction(index);
                }
                }

+ 4 - 4
demo/src/main/java/com/demo/controller/DemoController.java

@ -16,10 +16,10 @@ public class DemoController {
    @RequestMapping(value = "/loginfo", method = RequestMethod.GET)
    @RequestMapping(value = "/loginfo", method = RequestMethod.GET)
    public String loginfo() {
    public String loginfo() {
        logger.info("{\"aaa\":\"123\",\"bbb\":\"123\",\"ccc\":\"123\"}");
        logger.error("{\"aaa\":\"321\",\"bbb\":\"321\",\"ccc\":\"321\"}");
        boolean flag = true;
        while (flag) {
            logger.info("{\"aaa\":\"123\",\"bbb\":\"123\",\"ccc\":\"123\"}");
        }
        return "成功";
        return "成功";
    }
    }