Skip to content
This repository has been archived by the owner on Jan 12, 2024. It is now read-only.

Commit

Permalink
chore: added more logging into policy and appender
Browse files Browse the repository at this point in the history
  • Loading branch information
melanahammel committed Feb 14, 2020
1 parent e7605d1 commit 52a1a4b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,32 @@ public AuditLogsS3TimeBasedRollingPolicy(
@Autowired
public void setS3LogUploaderService(S3LogUploaderService s3LogUploaderService) {
this.s3LogUploaderService = s3LogUploaderService;
log.info("Setting up S3 Uploader Service in policy");
if (logChunkFileS3Queue.size() > 0) {
Stream.generate(() -> logChunkFileS3Queue.poll()).forEach(s3LogUploaderService::ingestLog);
Stream.generate(() -> logChunkFileS3Queue.poll())
.forEach(
filename -> {
s3LogUploaderService.ingestLog(filename);
log.info("Log ingested in policy for: " + filename);
});
}
}

private boolean isS3AuditLogCopyingEnabled() {
log.info("isS3AuditLogCopyingEnabled hit");
return StringUtils.isNotBlank(bucket) && StringUtils.isNotBlank(bucketRegion);
}

@Override
public void rollover() throws RolloverFailure {
super.rollover();

log.info("Policy rollover hit");
if (isS3AuditLogCopyingEnabled()) {
String filename = timeBasedFileNamingAndTriggeringPolicy.getElapsedPeriodsFileName() + ".gz";
if (s3LogUploaderService != null) {
s3LogUploaderService.ingestLog(filename);
log.info("Log ingested in policy rollover for: " + filename);
} else {
logChunkFileS3Queue.offer(filename);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,22 @@
package ch.qos.logback.core.rolling;

import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;

/** Appender that will roll the logs every 5 minutes */
@Slf4j
public class FiveMinuteRollingFileAppender<E> extends RollingFileAppender<E> {
private long start = System.currentTimeMillis();

@Override
public void rollover() {
long currentTime = System.currentTimeMillis();
long maxIntervalSinceLastLoggingInMillis = TimeUnit.MINUTES.toMillis(5);

log.info("In Appender rollover");
if ((currentTime - start) >= maxIntervalSinceLastLoggingInMillis) {
super.rollover();
start = System.currentTimeMillis();
log.info("rollover happening in appender");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public S3LogUploaderService(
this.athenaService = athenaService;

amazonS3 = s3ClientFactory.getClient(bucketRegion);
log.info("S3 Uploader Service initialized");
log.info("S3 Uploader Service initialized with additional logging statements");
}

/** Convenience method for sleeping */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,13 @@ public AthenaAuditLoggerConfiguration(
logger.setLevel(Level.INFO);
logger.setAdditive(false);
athenaAuditLogger = logger;

athenaAuditLogger.info("completed athena audit logger configuration");
}

@Bean
public Logger getAthenaAuditLogger() {
athenaAuditLogger.info("retrieving athena audit logger: " + athenaAuditLogger.getName());
return athenaAuditLogger;
}
}

0 comments on commit 52a1a4b

Please sign in to comment.