Permalink
Browse files

Change property prefix to "GRAYLOG_" (environment) and "graylog." (sy…

…stem properties)

(cherry picked from commit f2795f3)
  • Loading branch information...
joschi committed Jan 5, 2016
1 parent a5901b6 commit 48ed88d4a7897152f7daa16f0d77e03b824d7b48
Showing with 5 additions and 4 deletions.
  1. +5 −4 graylog2-bootstrap/src/main/java/org/graylog2/bootstrap/CmdLineTool.java
@@ -80,8 +80,6 @@
public abstract class CmdLineTool implements CliCommand {
private static final Logger LOG = LoggerFactory.getLogger(CmdLineTool.class);
protected static final String ENVIRONMENT_PREFIX = "GRAYLOG2_";
protected static final String PROPERTIES_PREFIX = "graylog2.";
protected static final Version version = Version.CURRENT_CLASSPATH;
protected static final String FILE_SEPARATOR = System.getProperty("file.separator");
protected static final String TMPDIR = System.getProperty("java.io.tmpdir", "/tmp");
@@ -284,8 +282,11 @@ private String getPluginPath(String configFile) {
protected Collection<Repository> getConfigRepositories(String configFile) {
return Arrays.asList(
new EnvironmentRepository(ENVIRONMENT_PREFIX),
new SystemPropertiesRepository(PROPERTIES_PREFIX),
new EnvironmentRepository("GRAYLOG_"),
new SystemPropertiesRepository("graylog."),
// Legacy prefixes
new EnvironmentRepository("GRAYLOG2_"),
new SystemPropertiesRepository("graylog2."),
new PropertiesRepository(configFile)
);
}

0 comments on commit 48ed88d

Please sign in to comment.