diff --git a/README.md b/README.md index 352cfa733..de2fab9b8 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ See [Logback filters](https://logback.qos.ch/manual/filters.html#thresholdFilter application.log - + WARN diff --git a/samples/pom.xml b/samples/pom.xml index 6e0c15d5d..20c2f8317 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -13,7 +13,7 @@ com.google.cloud.samples 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 30bfdfee4..079956fd7 100644 --- a/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java +++ b/src/main/java/com/google/cloud/logging/logback/LoggingAppender.java @@ -62,7 +62,7 @@ * <!-- Optional: defaults to {@code "java.log"} --> * <log>application.log</log> * - * <!-- Optional: defaults to {@code "ERROR"} --> + * <!-- Optional: defaults to {@code "OFF"} --> * <flushLevel>WARN</flushLevel> * * <!-- Optional: defaults to {@code ASYNC} --> @@ -150,7 +150,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase { /** * Sets a threshold for log severity level to flush all log entries that were batched so far. * - *

Defaults to Error. + *

Defaults to OFF. * * @param flushLevel Logback log level */ @@ -298,7 +298,7 @@ void setupMonitoredResource(MonitoredResource monitoredResource) { } private Level getFlushLevel() { - return (flushLevel != null) ? flushLevel : Level.ERROR; + return (flushLevel != null) ? flushLevel : Level.OFF; } private String getLogName() { 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 6cd59f575..9632cf330 100644 --- a/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java +++ b/src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java @@ -193,9 +193,15 @@ public void testFlushLevelConfigSupportsFlushLevelOff() { assertThat(foundSeverity).isEqualTo(null); } + @Test + public void testDefaultFlushLevelOff() { + loggingAppender.start(); + Severity foundSeverity = logging.getFlushSeverity(); + assertThat(foundSeverity).isEqualTo(null); + } + @Test public void testFilterLogsOnlyLogsAtOrAboveLogLevel() { - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), @@ -223,7 +229,6 @@ public void testFilterLogsOnlyLogsAtOrAboveLogLevel() { @Test public void testPartialSuccessOverrideHasExpectedValue() { - logging.setFlushSeverity(Severity.ERROR); Capture logNameArg = Capture.newInstance(); Capture resourceArg = Capture.newInstance(); Capture partialSuccessArg = Capture.newInstance(); @@ -247,7 +252,6 @@ public void testPartialSuccessOverrideHasExpectedValue() { @Test public void testDefaultWriteOptionsHasExpectedDefaults() { - logging.setFlushSeverity(Severity.ERROR); Capture partialSuccessArg = Capture.newInstance(); logging.write( EasyMock.>anyObject(), @@ -266,7 +270,6 @@ public void testDefaultWriteOptionsHasExpectedDefaults() { @Test public void testMdcValuesAreConvertedToLabels() { - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), @@ -325,7 +328,6 @@ public void testMdcValuesAreConvertedToLabelsWithPassingNullValues() { MDC.put("mdc1", "value1"); MDC.put("mdc2", null); MDC.put("mdc3", "value3"); - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), @@ -351,7 +353,6 @@ public void testMdcValuesAreConvertedToLabelsWithPassingNullValues() { @Test public void testAddCustomLoggingEventEnhancers() { MDC.put("mdc1", "value1"); - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), @@ -375,7 +376,6 @@ public void testAddCustomLoggingEventEnhancers() { @Test public void testAddCustomLoggingEnhancer() { - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), @@ -398,7 +398,6 @@ public void testAddCustomLoggingEnhancer() { @Test @SuppressWarnings("deprecation") public void testFlush() { - logging.setFlushSeverity(Severity.ERROR); logging.write( EasyMock.>anyObject(), anyObject(WriteOption.class), @@ -419,7 +418,6 @@ public void testFlush() { @Test public void testAutoPopulationEnabled() { - logging.setFlushSeverity(Severity.ERROR); Capture> capturedLogEntries = Capture.newInstance(); EasyMock.expect( logging.populateMetadata( @@ -458,7 +456,6 @@ public void testAutoPopulationEnabled() { @Test public void testRedirectToStdoutEnabled() { - logging.setFlushSeverity(Severity.ERROR); EasyMock.expect( logging.populateMetadata( EasyMock.>anyObject(), @@ -503,7 +500,6 @@ public void testRedirectToStdoutDisabled() { public void testFDiagnosticInfoAdded() { LoggingAppender.setInstrumentationStatus(false); Capture> capturedArgument = Capture.newInstance(); - logging.setFlushSeverity(Severity.ERROR); logging.write( capture(capturedArgument), anyObject(WriteOption.class), @@ -547,7 +543,6 @@ public void testFDiagnosticInfoAdded() { @Test public void testFDiagnosticInfoNotAdded() { - logging.setFlushSeverity(Severity.ERROR); Capture> capturedArgument = Capture.newInstance(); logging.write( capture(capturedArgument), diff --git a/src/test/java/com/google/cloud/logging/logback/logback.xml b/src/test/java/com/google/cloud/logging/logback/logback.xml index d0ec77843..66e86e4e7 100644 --- a/src/test/java/com/google/cloud/logging/logback/logback.xml +++ b/src/test/java/com/google/cloud/logging/logback/logback.xml @@ -8,7 +8,7 @@ application.log - + WARN