kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liy...@apache.org
Subject kylin git commit: minor, cleanup kylin_rest_address in kylin.sh
Date Wed, 23 Nov 2016 14:28:49 GMT
Repository: kylin
Updated Branches:
  refs/heads/master 83adb8eb8 -> 53b5a6d8e


minor, cleanup kylin_rest_address in kylin.sh


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/53b5a6d8
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/53b5a6d8
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/53b5a6d8

Branch: refs/heads/master
Commit: 53b5a6d8e2fa854cbf09ea66fc39bdfbd961950f
Parents: 83adb8e
Author: Yang Li <liyang@apache.org>
Authored: Wed Nov 23 22:28:38 2016 +0800
Committer: Yang Li <liyang@apache.org>
Committed: Wed Nov 23 22:28:38 2016 +0800

----------------------------------------------------------------------
 build/bin/kylin.sh                                        | 10 +---------
 .../apache/kylin/common/BackwardCompatibilityConfig.java  |  2 ++
 2 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/53b5a6d8/build/bin/kylin.sh
----------------------------------------------------------------------
diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh
index d3aa4cb..fca1e5c 100644
--- a/build/bin/kylin.sh
+++ b/build/bin/kylin.sh
@@ -86,14 +86,7 @@ then
     #additionally add tomcat libs to HBASE_CLASSPATH_PREFIX
     export HBASE_CLASSPATH_PREFIX=${tomcat_root}/bin/bootstrap.jar:${tomcat_root}/bin/tomcat-juli.jar:${tomcat_root}/lib/*:${HBASE_CLASSPATH_PREFIX}
 
-    if [ -z "$KYLIN_REST_ADDRESS" ]
-    then
-        kylin_rest_address=`hostname -f`":"`grep "<Connector port=" ${tomcat_root}/conf/server.xml
|grep protocol=\"HTTP/1.1\" | cut -d '=' -f 2 | cut -d \" -f 2`
-    else
-        kylin_rest_address=$KYLIN_REST_ADDRESS
-    fi
-    verbose "kylin.rest.address is set to ${kylin_rest_address}"
-
+    kylin_rest_address=`hostname -f`":"`grep "<Connector port=" ${tomcat_root}/conf/server.xml
|grep protocol=\"HTTP/1.1\" | cut -d '=' -f 2 | cut -d \" -f 2`
     kylin_rest_address_arr=(${kylin_rest_address//;/ })
     nc -z -w 5 ${kylin_rest_address_arr[0]} ${kylin_rest_address_arr[1]} 1>/dev/null 2>&1;
nc_result=$?
     if [ $nc_result -eq 0 ]; then
@@ -119,7 +112,6 @@ then
     -Dkylin.hive.dependency=${hive_dependency} \
     -Dkylin.hbase.dependency=${hbase_dependency} \
     -Dkylin.kafka.dependency=${kafka_dependency} \
-    -Dkylin.rest.address=${kylin_rest_address} \
     -Dspring.profiles.active=${spring_profile} \
     org.apache.hadoop.util.RunJar ${tomcat_root}/bin/bootstrap.jar  org.apache.catalina.startup.Bootstrap
start >> ${KYLIN_HOME}/logs/kylin.out 2>&1 & echo $! > ${KYLIN_HOME}/pid
&
     

http://git-wip-us.apache.org/repos/asf/kylin/blob/53b5a6d8/core-common/src/main/java/org/apache/kylin/common/BackwardCompatibilityConfig.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/BackwardCompatibilityConfig.java
b/core-common/src/main/java/org/apache/kylin/common/BackwardCompatibilityConfig.java
index 664d9bb..21df932 100644
--- a/core-common/src/main/java/org/apache/kylin/common/BackwardCompatibilityConfig.java
+++ b/core-common/src/main/java/org/apache/kylin/common/BackwardCompatibilityConfig.java
@@ -185,6 +185,8 @@ public class BackwardCompatibilityConfig {
         // exclude webapp/app/components
         if (f.getName().equals("components") && f.getParentFile().getName().equals("app"))
             return false;
+        else if (f.getName().equals("node_modules") && f.getParentFile().getName().equals("webapp"))
+            return false;
         else if (f.getName().equals("target"))
             return false;
         else


Mime
View raw message