Skip to content

logging: don't hard code config string #1728

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
pongad merged 2 commits into from
Mar 12, 2017
Merged

logging: don't hard code config string #1728

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70353e5
logging: don't hard code config string
pongad Mar 10, 2017
56d06ad
make codacy happy
pongad Mar 10, 2017
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
53 changes: 28 additions & 25 deletions google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.util.Collections;
import java.util.Map;
import java.util.logging.ErrorManager;
import java.util.logging.Filter;
import java.util.logging.Formatter;
Expand Down Expand Up @@ -135,33 +136,35 @@ public class LoggingHandlerTest {
.addLabel("levelValue", String.valueOf(LoggingLevel.EMERGENCY.intValue()))
.setTimestamp(123456789L)
.build();
private static final String CONFIG_FILE_STRING =
(new StringBuilder())
.append("com.google.cloud.logging.LoggingHandler.log=testLogName")
.append(System.lineSeparator())
.append("com.google.cloud.logging.LoggingHandler.level=ALL")
.append(System.lineSeparator())
.append(
"com.google.cloud.logging.LoggingHandler.filter=com.google.cloud.logging.LoggingHandlerTest$TestFilter")
.append(System.lineSeparator())
.append(
"com.google.cloud.logging.LoggingHandler.formatter=com.google.cloud.logging.LoggingHandlerTest$TestFormatter")
.append(System.lineSeparator())
.append("com.google.cloud.logging.LoggingHandler.flushSize=2")
.append(System.lineSeparator())
.append("com.google.cloud.logging.LoggingHandler.flushLevel=CRITICAL")
.append(System.lineSeparator())
.append(
"com.google.cloud.logging.LoggingHandler.enhancers=com.google.cloud.logging.LoggingHandlerTest$TestEnhancer")
.append(System.lineSeparator())
.append("com.google.cloud.logging.LoggingHandler.resourceType=testResourceType")
.append(System.lineSeparator())
.append("com.google.cloud.logging.LoggingHandler.synchronicity=SYNC")
.append(System.lineSeparator())
.toString();
private static final String CONFIG_NAMESPACE = "com.google.cloud.logging.LoggingHandler";
private static final ImmutableMap<String, String> CONFIG_MAP =
ImmutableMap.<String, String>builder()
.put("log", "testLogName")
.put("level", "ALL")
.put("filter", "com.google.cloud.logging.LoggingHandlerTest$TestFilter")
.put("formatter", "com.google.cloud.logging.LoggingHandlerTest$TestFormatter")
.put("flushSize", "2")
.put("flushLevel", "CRITICAL")
.put("enhancers", "com.google.cloud.logging.LoggingHandlerTest$TestEnhancer")
.put("resourceType", "testResourceType")
.put("synchronicity", "SYNC")
.build();
private static final WriteOption[] DEFAULT_OPTIONS =
new WriteOption[] {WriteOption.logName(LOG_NAME), WriteOption.resource(DEFAULT_RESOURCE)};

private static byte[] renderConfig(Map<String, String> config) {
StringBuilder str = new StringBuilder();
for (Map.Entry<String, String> entry : config.entrySet()) {
str.append(CONFIG_NAMESPACE)
.append('.')
.append(entry.getKey())
.append('=')
.append(entry.getValue())
.append(System.lineSeparator());
}
return str.toString().getBytes();
}

private Logging logging;
private LoggingOptions options;

Expand Down Expand Up @@ -454,7 +457,7 @@ public void testPropertiesFile() throws IOException, InterruptedException {
"testResourceType", ImmutableMap.of("project_id", PROJECT, "enhanced", "true"))));
EasyMock.replay(options, logging);
LogManager.getLogManager()
.readConfiguration(new ByteArrayInputStream(CONFIG_FILE_STRING.getBytes()));
.readConfiguration(new ByteArrayInputStream(renderConfig(CONFIG_MAP)));
LoggingHandler handler = new LoggingHandler(null, options);
LogRecord record = new LogRecord(Level.FINEST, MESSAGE);
record.setMillis(123456789L);
Expand Down