Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix up some bugs

This commit is contained in:
fjy 2014-09-30 17:20:52 -07:00
parent a0782d4c54
commit c3bea245a7
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indexing-service/src/main/java/io/druid/guice/IndexingServiceTaskLogsModule.java
View File

@ -37,13 +37,13 @@ public class IndexingServiceTaskLogsModule implements Module
public void configure(Binder binder) public void configure(Binder binder)
{ {
PolyBind.createChoice(binder, "druid.indexer.logs.type", Key.get(TaskLogs.class), Key.get(FileTaskLogs.class)); PolyBind.createChoice(binder, "druid.indexer.logs.type", Key.get(TaskLogs.class), Key.get(FileTaskLogs.class));
JsonConfigProvider.bind(binder, "druid.indexer.logs", FileTaskLogsConfig.class);
final MapBinder<String, TaskLogs> taskLogBinder = Binders.taskLogsBinder(binder); final MapBinder<String, TaskLogs> taskLogBinder = Binders.taskLogsBinder(binder);
taskLogBinder.addBinding("noop").to(NoopTaskLogs.class).in(LazySingleton.class); taskLogBinder.addBinding("noop").to(NoopTaskLogs.class).in(LazySingleton.class);
taskLogBinder.addBinding("file").to(FileTaskLogs.class).in(LazySingleton.class); taskLogBinder.addBinding("file").to(FileTaskLogs.class).in(LazySingleton.class);
binder.bind(NoopTaskLogs.class).in(LazySingleton.class); binder.bind(NoopTaskLogs.class).in(LazySingleton.class);
binder.bind(FileTaskLogs.class).in(LazySingleton.class); binder.bind(FileTaskLogs.class).in(LazySingleton.class);
JsonConfigProvider.bind(binder, "druid.indexer.logs", FileTaskLogsConfig.class);
binder.bind(TaskLogPusher.class).to(TaskLogs.class); binder.bind(TaskLogPusher.class).to(TaskLogs.class);
} }

6
indexing-service/src/main/java/io/druid/indexing/common/config/FileTaskLogsConfig.java
View File

@ -19,7 +19,6 @@
package io.druid.indexing.common.config; package io.druid.indexing.common.config;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
@ -31,7 +30,10 @@ public class FileTaskLogsConfig
@NotNull @NotNull
private File directory = new File("log"); private File directory = new File("log");
@JsonCreator public FileTaskLogsConfig()
{
}
public FileTaskLogsConfig(File directory) public FileTaskLogsConfig(File directory)
{ {
this.directory = directory; this.directory = directory;

2
server/src/main/java/io/druid/segment/realtime/firehose/LocalFirehoseFactory.java
View File

@ -81,7 +81,7 @@ public class LocalFirehoseFactory implements FirehoseFactory<StringInputRowParse
public Firehose connect(StringInputRowParser firehoseParser) throws IOException public Firehose connect(StringInputRowParser firehoseParser) throws IOException
{ {
Collection<File> foundFiles = FileUtils.listFiles( Collection<File> foundFiles = FileUtils.listFiles(
baseDir, baseDir.getAbsoluteFile(),
new WildcardFileFilter(filter), new WildcardFileFilter(filter),
TrueFileFilter.INSTANCE TrueFileFilter.INSTANCE
); );