[incubator-druid] branch master updated: Composite request logger doesn't invoke @LifeCycleStart and @LifeCycleStop methods on its dependencies (#6173)

[gian]

This is an automated email from the ASF dual-hosted git repository.

gian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git


The following commit(s) were added to refs/heads/master by this push:
     new 1c8032f  Composite request logger doesn't invoke @LifeCycleStart and 
@LifeCycleStop methods on its dependencies (#6173)
1c8032f is described below

commit 1c8032f9f3715c93e64673cbe6c2ccf5fca8e843
Author: Samarth Jain <sama...@apache.org>
AuthorDate: Fri Aug 17 09:34:25 2018 -0700

    Composite request logger doesn't invoke @LifeCycleStart and @LifeCycleStop 
methods on its dependencies (#6173)
---
 .../server/log/ComposingRequestLoggerProvider.java   | 20 ++++++++++++++++++++
 .../java/io/druid/server/log/FileRequestLogger.java  |  4 +++-
 .../main/java/io/druid/server/log/RequestLogger.java |  4 ++++
 .../io/druid/server/log/FileRequestLoggerTest.java   |  3 +--
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git 
a/server/src/main/java/io/druid/server/log/ComposingRequestLoggerProvider.java 
b/server/src/main/java/io/druid/server/log/ComposingRequestLoggerProvider.java
index 42b7289..c98edba 100644
--- 
a/server/src/main/java/io/druid/server/log/ComposingRequestLoggerProvider.java
+++ 
b/server/src/main/java/io/druid/server/log/ComposingRequestLoggerProvider.java
@@ -23,6 +23,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
+import io.druid.java.util.common.lifecycle.LifecycleStart;
+import io.druid.java.util.common.lifecycle.LifecycleStop;
 import io.druid.java.util.common.logger.Logger;
 import io.druid.server.RequestLogLine;
 
@@ -63,6 +65,24 @@ public class ComposingRequestLoggerProvider implements 
RequestLoggerProvider
       this.loggers = loggers;
     }
 
+    @LifecycleStart
+    @Override
+    public void start() throws Exception
+    {
+      for (RequestLogger logger : loggers) {
+        logger.start();
+      }
+    }
+
+    @LifecycleStop
+    @Override
+    public void stop()
+    {
+      for (RequestLogger logger : loggers) {
+        logger.stop();
+      }
+    }
+
     @Override
     public void log(RequestLogLine requestLogLine) throws IOException
     {
diff --git a/server/src/main/java/io/druid/server/log/FileRequestLogger.java 
b/server/src/main/java/io/druid/server/log/FileRequestLogger.java
index 31067e8..bf056e8 100644
--- a/server/src/main/java/io/druid/server/log/FileRequestLogger.java
+++ b/server/src/main/java/io/druid/server/log/FileRequestLogger.java
@@ -63,7 +63,8 @@ public class FileRequestLogger implements RequestLogger
   }
 
   @LifecycleStart
-  public void start()
+  @Override
+  public void start() throws Exception
   {
     try {
       baseDir.mkdirs();
@@ -117,6 +118,7 @@ public class FileRequestLogger implements RequestLogger
   }
 
   @LifecycleStop
+  @Override
   public void stop()
   {
     synchronized (lock) {
diff --git a/server/src/main/java/io/druid/server/log/RequestLogger.java 
b/server/src/main/java/io/druid/server/log/RequestLogger.java
index 601c318..13c86d3 100644
--- a/server/src/main/java/io/druid/server/log/RequestLogger.java
+++ b/server/src/main/java/io/druid/server/log/RequestLogger.java
@@ -28,4 +28,8 @@ import java.io.IOException;
 public interface RequestLogger
 {
   void log(RequestLogLine requestLogLine) throws IOException;
+
+  default void start() throws Exception {}
+
+  default void stop() {}
 }
diff --git 
a/server/src/test/java/io/druid/server/log/FileRequestLoggerTest.java 
b/server/src/test/java/io/druid/server/log/FileRequestLoggerTest.java
index 3cf9474..9ba4319 100644
--- a/server/src/test/java/io/druid/server/log/FileRequestLoggerTest.java
+++ b/server/src/test/java/io/druid/server/log/FileRequestLoggerTest.java
@@ -31,7 +31,6 @@ import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.concurrent.Executors;
@@ -45,7 +44,7 @@ public class FileRequestLoggerTest
   @Rule
   public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-  @Test public void testLog() throws IOException
+  @Test public void testLog() throws Exception
   {
     ObjectMapper objectMapper = new ObjectMapper();
     DateTime dateTime = DateTimes.nowUtc();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@druid.apache.org
For additional commands, e-mail: commits-h...@druid.apache.org