You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2023/06/25 01:20:13 UTC

[iotdb] branch master updated: [IOTDB-5809]The search configuration file path specification is inconsistent (#10236)

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 30018f2d530 [IOTDB-5809]The search configuration file path specification is inconsistent (#10236)
30018f2d530 is described below

commit 30018f2d53034637db13c402275302b1162a22f2
Author: CloudWise-Lukemiao <76...@users.noreply.github.com>
AuthorDate: Sun Jun 25 09:20:08 2023 +0800

    [IOTDB-5809]The search configuration file path specification is inconsistent (#10236)
    
    When configuring IOTDB_HOME, find ${IOTDB_HOME}/conf/iotdb-rest.properties
    
    Co-authored-by: liupfei <li...@yonyou.com>
---
 .../java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceDescriptor.java  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceDescriptor.java
index 61658c4ac67..6d485ab51e1 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/rest/IoTDBRestServiceDescriptor.java
@@ -125,8 +125,6 @@ public class IoTDBRestServiceDescriptor {
                 + File.separatorChar
                 + "conf"
                 + File.separatorChar
-                + "rest"
-                + File.separatorChar
                 + IoTDBRestServiceConfig.CONFIG_NAME;
       } else {
         // If this too wasn't provided, try to find a default config in the root of the classpath.