From 498ee24b52a6876a008c3d3d3ef4870e4bd9842c Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Wed, 18 Jun 2014 14:05:31 -0500 Subject: [PATCH] =?UTF-8?q?add=20file:///=20on=20Windows=20to=20-Dcassandr?= =?UTF-8?q?a.config=20value=20patch=20by=20Marco=20Tulio=20Avila=20Cer?= =?UTF-8?q?=C3=B3n;=20reviewed=20by=20Lyuben=20Todorov=20for=20CASSANDRA-7?= =?UTF-8?q?398?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cassandra/config/YamlConfigurationLoader.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index 4a1280c9af..e5885b18db 100644 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@ -33,6 +33,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.utils.FBUtilities; import org.yaml.snakeyaml.TypeDescription; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.error.YAMLException; @@ -45,6 +46,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader private static final Logger logger = LoggerFactory.getLogger(YamlConfigurationLoader.class); private final static String DEFAULT_CONFIGURATION = "cassandra.yaml"; + private static final String FILE_PREFIX = "file:///"; /** * Inspect the classpath to find storage configuration file @@ -53,7 +55,15 @@ public class YamlConfigurationLoader implements ConfigurationLoader { String configUrl = System.getProperty("cassandra.config"); if (configUrl == null) + { configUrl = DEFAULT_CONFIGURATION; + } + else if (!FBUtilities.isUnix() && !configUrl.startsWith(FILE_PREFIX)) + { + String format = "Non-unix environment detected, %s prefix not supplied at the beginning of file path but is required. Changing path to %s"; + configUrl = FILE_PREFIX + configUrl; + logger.warn(String.format(format, FILE_PREFIX, configUrl)); + } URL url; try