remove redundant logging

Author: lizk886

src/main/java/com/uid2/operator/vertx/OperatorShutdownHandler.java

@@ -16,15 +16,13 @@
 public class OperatorShutdownHandler {
     private static final Logger LOGGER = LoggerFactory.getLogger(OperatorShutdownHandler.class);
     private static final int SALT_FAILURE_LOG_INTERVAL_MINUTES = 10;
-    private static final int KEYSET_KEY_FAILURE_LOG_INTERVAL_MINUTES = 10;
     private final Duration attestShutdownWaitTime;
     private final Duration saltShutdownWaitTime;
     private final Duration keysetKeyShutdownWaitTime;
     private final AtomicReference<Instant> attestFailureStartTime = new AtomicReference<>(null);
     private final AtomicReference<Instant> saltFailureStartTime = new AtomicReference<>(null);
     private final AtomicReference<Instant> keysetKeyFailureStartTime = new AtomicReference<>(null);
     private final AtomicReference<Instant> lastSaltFailureLogTime = new AtomicReference<>(null);
-    private final AtomicReference<Instant> lastKeysetKeyFailureLogTime = new AtomicReference<>(null);
     private final Clock clock;
     private final ShutdownService shutdownService;
 
@@ -65,7 +63,6 @@ public void handleKeysetKeyRefreshResponse(Boolean success) {
             keysetKeyFailureStartTime.set(null);
             LOGGER.debug("keyset keys sync successful"); 
         } else {
-            logKeysetKeyFailureAtInterval();
             Instant t = keysetKeyFailureStartTime.get();
             if (t == null) {
                 keysetKeyFailureStartTime.set(clock.instant());
@@ -84,14 +81,6 @@ public void handleKeysetKeyRefreshResponse(Boolean success) {
         }
     }
 
-    public void logKeysetKeyFailureAtInterval() {
-        Instant t = lastKeysetKeyFailureLogTime.get();
-        if (t == null || clock.instant().isAfter(t.plus(KEYSET_KEY_FAILURE_LOG_INTERVAL_MINUTES, ChronoUnit.MINUTES))) {
-            LOGGER.error("keyset keys sync failing");
-            lastKeysetKeyFailureLogTime.set(Instant.now());
-        }
-    }
-
     public void handleAttestResponse(Pair<AttestationResponseCode, String> response) {
         if (response.left() == AttestationResponseCode.AttestationFailure) {
             LOGGER.error("core attestation failed with AttestationFailure, shutting down operator, core response: {}", response.right());

src/test/java/com/uid2/operator/OperatorShutdownHandlerTest.java

@@ -174,8 +174,7 @@ void shutdownOnKeysetKeyFailedTooLong(VertxTestContext testContext) {
         ((Logger) LoggerFactory.getLogger(OperatorShutdownHandler.class)).addAppender(logWatcher);
 
         this.operatorShutdownHandler.handleKeysetKeyRefreshResponse(false);
-        Assertions.assertTrue(logWatcher.list.get(0).getFormattedMessage().contains("keyset keys sync failing"));
-        Assertions.assertTrue(logWatcher.list.get(1).getFormattedMessage().contains("keyset keys sync started failing"));
+        Assertions.assertTrue(logWatcher.list.get(0).getFormattedMessage().contains("keyset keys sync started failing"));
 
         when(clock.instant()).thenAnswer(i -> Instant.now().plus(7, ChronoUnit.DAYS).plusSeconds(60));
         try {
@@ -203,31 +202,6 @@ void keysetKeyRecoverOnSuccess(VertxTestContext testContext) {
         testContext.completeNow();
     }
 
-    @Test
-    void keysetKeyLogErrorAtInterval(VertxTestContext testContext) {
-        ListAppender<ILoggingEvent> logWatcher = new ListAppender<>();
-        logWatcher.start();
-        ((Logger) LoggerFactory.getLogger(OperatorShutdownHandler.class)).addAppender(logWatcher);
-
-        this.operatorShutdownHandler.handleKeysetKeyRefreshResponse(false);
-        long errorLogCount1 = logWatcher.list.stream().filter(log -> 
-            log.getFormattedMessage().contains("keyset keys sync failing")).count();
-        
-        when(clock.instant()).thenAnswer(i -> Instant.now().plus(9, ChronoUnit.MINUTES));
-        this.operatorShutdownHandler.handleKeysetKeyRefreshResponse(false);
-        long errorLogCount2 = logWatcher.list.stream().filter(log -> 
-            log.getFormattedMessage().contains("keyset keys sync failing")).count();
-        Assertions.assertEquals(errorLogCount1, errorLogCount2);
-        
-        when(clock.instant()).thenAnswer(i -> Instant.now().plus(11, ChronoUnit.MINUTES));
-        this.operatorShutdownHandler.handleKeysetKeyRefreshResponse(false);
-        long errorLogCount3 = logWatcher.list.stream().filter(log -> 
-            log.getFormattedMessage().contains("keyset keys sync failing")).count();
-        Assertions.assertTrue(errorLogCount3 > errorLogCount2);
-
-        testContext.completeNow();
-    }
-
     @Test
     void keysetKeyNoShutdownWhenAlwaysSuccessful(VertxTestContext testContext) {
         this.operatorShutdownHandler.handleKeysetKeyRefreshResponse(true);