Skip to content

Move some messages to CONFIG level to make log less chatty #2387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2021
Merged

Move some messages to CONFIG level to make log less chatty #2387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions operator/src/main/java/oracle/kubernetes/operator/TuningParametersImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ private void update() {
if (!main.equals(this.main)
|| !callBuilder.equals(this.callBuilder)
|| !watch.equals(this.watch)
|| !watch.equals(this.pod)
|| !pod.equals(this.featureGates)) {
LOGGER.info(MessageKeys.TUNING_PARAMETERS);
|| !pod.equals(this.pod)
|| !featureGates.equals(this.featureGates)) {
LOGGER.config(MessageKeys.TUNING_PARAMETERS);
}
this.main = main;
this.callBuilder = callBuilder;
Expand Down
2 changes: 1 addition & 1 deletion operator/src/main/java/oracle/kubernetes/operator/utils/Certificates.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ private static String getCertificate(String path, String failureMessage) {
try {
return new String(Files.readAllBytes(GET_PATH.apply(path)));
} catch (IOException e) {
LOGGER.warning(failureMessage, path);
LOGGER.config(failureMessage, path);
return null;
}
}
Expand Down
9 changes: 5 additions & 4 deletions operator/src/test/java/oracle/kubernetes/operator/utils/CertificatesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import static oracle.kubernetes.operator.logging.MessageKeys.NO_EXTERNAL_CERTIFICATE;
import static oracle.kubernetes.operator.logging.MessageKeys.NO_INTERNAL_CERTIFICATE;
import static oracle.kubernetes.utils.LogMatcher.containsConfig;
import static oracle.kubernetes.utils.LogMatcher.containsWarning;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.notNullValue;
Expand Down Expand Up @@ -76,10 +77,10 @@ public void whenNoExternalCertificateFile_returnNull() {
}

@Test
public void whenNoExternalCertificateFile_logWarningMessage() {
public void whenNoExternalCertificateFile_logConfigMessage() {
assertThat(Certificates.getOperatorExternalCertificateData(), nullValue());

assertThat(logRecords, containsWarning(NO_EXTERNAL_CERTIFICATE));
assertThat(logRecords, containsConfig(NO_EXTERNAL_CERTIFICATE));
}

@Test
Expand All @@ -97,10 +98,10 @@ public void whenNoInternalCertificateFile_returnNull() {
}

@Test
public void whenNoInternalCertificateFile_logWarningMessage() {
public void whenNoInternalCertificateFile_logConfigMessage() {
Certificates.getOperatorInternalCertificateData();

assertThat(logRecords, containsWarning(NO_INTERNAL_CERTIFICATE));
assertThat(logRecords, containsConfig(NO_INTERNAL_CERTIFICATE));
}

@Test
Expand Down
4 changes: 4 additions & 0 deletions operator/src/test/java/oracle/kubernetes/utils/LogMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ public static LogMatcher containsSevere(String expectedMessage) {
return new LogMatcher(Level.SEVERE, expectedMessage);
}

public static LogMatcher containsConfig(String expectedMessage) {
return new LogMatcher(Level.CONFIG, expectedMessage);
}

public static LogMatcher containsFine(String expectedMessage) {
return new LogMatcher(Level.FINE, expectedMessage);
}
Expand Down