fix: change how logging policy is instantiated

Nike-Inc · Feb 13, 2020 · e7605d1 · e7605d1
1 parent 2f8a3bb
commit e7605d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/...r-athena/src/main/java/ch/qos/logback/core/rolling/AuditLogsS3TimeBasedRollingPolicy.java b/...r-athena/src/main/java/ch/qos/logback/core/rolling/AuditLogsS3TimeBasedRollingPolicy.java
@@ -20,11 +20,13 @@
 import com.nike.internal.util.StringUtils;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.stream.Stream;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 /** Rolling policy that will copy audit logs to S3 if enabled when the logs roll. */
+@Slf4j
 @Component
 public class AuditLogsS3TimeBasedRollingPolicy<E> extends TimeBasedRollingPolicy<E> {
 
@@ -36,9 +38,13 @@ public class AuditLogsS3TimeBasedRollingPolicy<E> extends TimeBasedRollingPolicy
   @Autowired
   public AuditLogsS3TimeBasedRollingPolicy(
       @Value("${cerberus.audit.athena.bucket}") String bucket,
-      @Value("${cerberus.audit.athena.bucketRegion}") String bucketRegion) {
+      @Value("${cerberus.audit.athena.bucketRegion}") String bucketRegion,
+      S3LogUploaderService s3LogUploaderService) {
     this.bucket = bucket;
     this.bucketRegion = bucketRegion;
+
+    setS3LogUploaderService(s3LogUploaderService);
+    log.info("AuditLogsS3TimeBasedRollingPolicy initialized");
   }
 
   @Autowired

diff --git a/...ogger-athena/src/main/java/ch/qos/logback/core/rolling/FiveMinuteRollingFileAppender.java b/...ogger-athena/src/main/java/ch/qos/logback/core/rolling/FiveMinuteRollingFileAppender.java
@@ -25,7 +25,7 @@ public class FiveMinuteRollingFileAppender<E> extends RollingFileAppender<E> {
   @Override
   public void rollover() {
     long currentTime = System.currentTimeMillis();
-    long maxIntervalSinceLastLoggingInMillis = TimeUnit.MINUTES.toMillis(1);
+    long maxIntervalSinceLastLoggingInMillis = TimeUnit.MINUTES.toMillis(5);
 
     if ((currentTime - start) >= maxIntervalSinceLastLoggingInMillis) {
       super.rollover();

diff --git a/...ger-athena/src/main/java/com/nike/cerberus/audit/logger/service/S3LogUploaderService.java b/...ger-athena/src/main/java/com/nike/cerberus/audit/logger/service/S3LogUploaderService.java
@@ -73,14 +73,6 @@ public S3LogUploaderService(
 
     amazonS3 = s3ClientFactory.getClient(bucketRegion);
     log.info("S3 Uploader Service initialized");
-
-    // Inject this into the logback rolling policy which was created before guice land exists
-    getRollingPolicy()
-        .ifPresent(
-            policy -> {
-              log.info("S3 Rolling Policy detected injecting S3 Log Uploader Service");
-              policy.setS3LogUploaderService(this);
-            });
   }
 
   /** Convenience method for sleeping */
@@ -201,7 +193,7 @@ public void executeServerShutdownHook() {
    */
   private Optional<AuditLogsS3TimeBasedRollingPolicy<ILoggingEvent>> getRollingPolicy() {
 
-    log.info("S3 Uploader Service getting rolling policy");
+    log.info("S3 Uploader Service getting rolling policy for shutdown hooks");
 
     if (athenaLoggingEventListenerEnabled) {
       ch.qos.logback.classic.Logger auditLogger =
@@ -210,7 +202,7 @@ private Optional<AuditLogsS3TimeBasedRollingPolicy<ILoggingEvent>> getRollingPol
       FiveMinuteRollingFileAppender<ILoggingEvent> appender =
           (FiveMinuteRollingFileAppender<ILoggingEvent>)
               auditLogger.getAppender(ATHENA_LOG_APPENDER);
-      // TODO figure out if appender is always null and when it should not be null
+
       if (appender != null) {
         return Optional.ofNullable(
             (AuditLogsS3TimeBasedRollingPolicy<ILoggingEvent>) appender.getRollingPolicy());