From d695ee4b969bc4d6605cc2416a6a581288678860 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Fri, 29 Jan 2021 17:18:56 -0800 Subject: [PATCH 1/4] allow turning off flush level --- .../com/google/cloud/logging/logback/LoggingAppender.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java index 65ec051ec..9789d2aa9 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -211,7 +211,10 @@ public synchronized void start() { MonitoredResource resource = getMonitoredResource(getProjectId()); defaultWriteOptions = new WriteOption[] {WriteOption.logName(getLogName()), WriteOption.resource(resource)}; - getLogging().setFlushSeverity(severityFor(getFlushLevel())); + Level flushLevel = getFlushLevel(); + if (flushLevel != Level.OFF) { + getLogging().setFlushSeverity(severityFor(flushLevel)); + } loggingEnhancers = new ArrayList<>(); List resourceEnhancers = MonitoredResourceUtil.getResourceEnhancers(); loggingEnhancers.addAll(resourceEnhancers); From 0e4e93e3e4ac8965a4c204fba532e456eb8fba50 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Fri, 29 Jan 2021 17:28:47 -0800 Subject: [PATCH 2/4] added test --- .../google/cloud/logging/logback/LoggingAppenderTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java index ec85327ce..485dbfa49 100644 --- a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java +++ b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java @@ -112,6 +112,14 @@ public void testFlushLevelConfigUpdatesLoggingFlushSeverity() { assertThat(capturedArgument.getValue().iterator().next()).isEqualTo(logEntry); } + @Test + public void testFlushLevelConfigSupportsFlushLevelOff() { + loggingAppender.setFlushLevel(Level.OFF); + loggingAppender.start(); + Severity foundSeverity = logging.getFlushSeverity(); + assertThat(null, is(foundSeverity)); + } + @Test public void testFilterLogsOnlyLogsAtOrAboveLogLevel() { Map jsonContent = new HashMap<>(); From d0cb277a65315586f02a99bcf43d3c53e0124bbb Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Fri, 29 Jan 2021 17:37:54 -0800 Subject: [PATCH 3/4] fixed assertion --- .../com/google/cloud/logging/logback/LoggingAppenderTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java index 485dbfa49..ab6cd8346 100644 --- a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java +++ b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java @@ -117,7 +117,7 @@ public void testFlushLevelConfigSupportsFlushLevelOff() { loggingAppender.setFlushLevel(Level.OFF); loggingAppender.start(); Severity foundSeverity = logging.getFlushSeverity(); - assertThat(null, is(foundSeverity)); + assertThat(foundSeverity).isEqualTo(null); } @Test From 3f918890cd92c9d9499b557d4d514c697fa5c7d4 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Fri, 29 Jan 2021 17:40:59 -0800 Subject: [PATCH 4/4] fixed lint issue --- .../java/com/google/cloud/logging/logback/LoggingAppender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java index 9789d2aa9..3c7b4411c 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -213,7 +213,7 @@ public synchronized void start() { new WriteOption[] {WriteOption.logName(getLogName()), WriteOption.resource(resource)}; Level flushLevel = getFlushLevel(); if (flushLevel != Level.OFF) { - getLogging().setFlushSeverity(severityFor(flushLevel)); + getLogging().setFlushSeverity(severityFor(flushLevel)); } loggingEnhancers = new ArrayList<>(); List resourceEnhancers = MonitoredResourceUtil.getResourceEnhancers();