jixuan1989
/
IoTDB
mirror of https://github.com/apache/iotdb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reforamt codes

This commit is contained in:
Dark Templar 2017-09-16 00:09:45 +08:00
parent a1b32d57b1
commit 47249181dc
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/cn/edu/tsinghua/iotdb/conf/TsfileDBDescriptor.java
View File

@ -42,17 +42,17 @@ public class TsfileDBDescriptor {
private void loadProps() {
InputStream inputStream = null;
String url = System.getProperty(TsFileDBConstant.IOTDB_CONF, null);
if(url == null){
if (url == null) {
url = System.getProperty(SystemConstant.TSFILE_HOME, TsfileDBConfig.CONFIG_DEFAULT_PATH);
if(!url.equals(TsfileDBConfig.CONFIG_DEFAULT_PATH)){
url = url + File.separatorChar+"conf"+ File.separatorChar+TsfileDBConfig.CONFIG_NAME;
}
if (!url.equals(TsfileDBConfig.CONFIG_DEFAULT_PATH)) {
url = url + File.separatorChar + "conf" + File.separatorChar + TsfileDBConfig.CONFIG_NAME;
}
}
try {
inputStream = new FileInputStream(new File(url));
inputStream = new FileInputStream(new File(url));
} catch (FileNotFoundException e) {
LOGGER.warn("Fail to find config file {}", url);
return;
LOGGER.warn("Fail to find config file {}", url);
return;
}
LOGGER.info("Start to read config file {}", url);