Skip to content

Commit 8080aa5

Browse files
bug fix
1 parent 0d5728a commit 8080aa5

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/main/java/com/dtstack/logstash/Main.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static void main(String[] args) {
9090
//assembly pipeline
9191
inputQueueList =assemblyPipeline.assemblyPipeline(cmdLine);
9292
//add shutdownhook
93-
ShutDownHook shutDownHook = new ShutDownHook(inputQueueList, assemblyPipeline.getBaseInputs(),assemblyPipeline.getBaseOutPuts());
93+
ShutDownHook shutDownHook = new ShutDownHook(inputQueueList, assemblyPipeline.getBaseInputs(),assemblyPipeline.getAllBaseOutputs());
9494
shutDownHook.addShutDownHook();
9595
} catch (Exception e) {
9696
logger.error("jlogstash_start error:{}",e.getCause());

src/main/java/com/dtstack/logstash/assembly/AssemblyPipeline.java

+7-5
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class AssemblyPipeline {
4141

4242
private List<BaseInput> baseInputs =null;
4343

44-
private List<BaseOutput> baseOutputs = Lists.newCopyOnWriteArrayList();
44+
private List<BaseOutput> allBaseOutputs = Lists.newCopyOnWriteArrayList();
4545

4646
/**
4747
* 组装管道
@@ -112,7 +112,7 @@ protected void initFilterAndOutputThread(List<Map> outputs, List<Map> filters, L
112112
List<BaseOutput> baseOutputs = OutputFactory.getBatchInstance(outputs);
113113
List<BaseFilter> baseFilters = FilterFactory.getBatchInstance(filters);
114114
filterOutputExecutor.submit(new FilterAndOutputThread(queue,baseFilters,baseOutputs,batchSize));
115-
baseOutputs.addAll(baseOutputs);
115+
allBaseOutputs.addAll(baseOutputs);
116116
}
117117
}
118118

@@ -162,8 +162,10 @@ protected static boolean isInputQueueSizeLog(CommandLine line){
162162
public List<BaseInput> getBaseInputs() {
163163
return this.baseInputs;
164164
}
165-
166-
public List<BaseOutput> getBaseOutPuts() {
167-
return this.baseOutputs;
165+
166+
167+
public List<BaseOutput> getAllBaseOutputs() {
168+
return allBaseOutputs;
168169
}
170+
169171
}

src/main/java/com/dtstack/logstash/assembly/ShutDownHook.java

-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package com.dtstack.logstash.assembly;
22

33
import java.util.List;
4-
54
import org.slf4j.Logger;
65
import org.slf4j.LoggerFactory;
7-
86
import com.dtstack.logstash.inputs.BaseInput;
97
import com.dtstack.logstash.outputs.BaseOutput;
108

0 commit comments

Comments
 (0)