[GitHub] gianm closed pull request #6173: Composite request logger doesn't invoke @LifeCycleStart and @LifeCycleStop methods on its dependencies

[GitBox <gi...@apache.org>]

gianm closed pull request #6173: Composite request logger doesn't invoke @LifeCycleStart and @LifeCycleStop methods on its dependencies
URL: https://github.com/apache/incubator-druid/pull/6173
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 42b7289ab8a..c98edbac953 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.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 ComposingRequestLogger(List<RequestLogger> loggers)
       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 31067e8aaeb..bf056e83e05 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 FileRequestLogger(ObjectMapper objectMapper, ScheduledExecutorService exe
   }
 
   @LifecycleStart
-  public void start()
+  @Override
+  public void start() throws Exception
   {
     try {
       baseDir.mkdirs();
@@ -117,6 +118,7 @@ private OutputStreamWriter getFileWriter() throws FileNotFoundException
   }
 
   @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 601c318fdc0..13c86d330b9 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 @@
 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 3cf947407e3..9ba4319aeb1 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.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 @@
   @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();


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

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