You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/03/23 07:59:37 UTC

[48/50] [abbrv] kylin git commit: KYLIN-1503 Print version information with kylin.sh

KYLIN-1503 Print version information with kylin.sh


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

Branch: refs/heads/master
Commit: 35c3e0fae8e207a953b302baefd159c01429f993
Parents: 6afeafc
Author: lidongsjtu <li...@apache.org>
Authored: Tue Mar 22 16:04:20 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Tue Mar 22 16:04:30 2016 +0800

----------------------------------------------------------------------
 build/bin/kylin.sh                                 |  6 ++++++
 .../java/org/apache/kylin/common/KylinVersion.java | 17 +++++++++++++++++
 .../org/apache/kylin/rest/init/ClientInfoTask.java |  8 +++++---
 3 files changed, 28 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/35c3e0fa/build/bin/kylin.sh
----------------------------------------------------------------------
diff --git a/build/bin/kylin.sh b/build/bin/kylin.sh
index f4d9fac..e99dd55 100644
--- a/build/bin/kylin.sh
+++ b/build/bin/kylin.sh
@@ -193,6 +193,12 @@ then
     org.apache.kylin.engine.streaming.cli.MonitorCLI $@ > ${KYLIN_HOME}/logs/monitor.log 2>&1
     exit 0
 
+elif [ "$1" = "version" ]
+then
+    export HBASE_CLASSPATH=${KYLIN_HOME}/lib/*
+    exec hbase ${KYLIN_EXTRA_START_OPTS} -Dlog4j.configuration=kylin-log4j.properties org.apache.kylin.common.KylinVersion
+    exit 0
+
 # tool command
 elif [[ "$1" = org.apache.kylin.* ]]
 then

http://git-wip-us.apache.org/repos/asf/kylin/blob/35c3e0fa/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
index 4bf5999..d55f969 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java
@@ -112,4 +112,21 @@ public class KylinVersion {
 
         return !signatureIncompatible;
     }
+
+    public static void main(String[] args) {
+        System.out.println(getKylinDetailInformation());
+    }
+
+    public static String getKylinDetailInformation() {
+        StringBuilder buf = new StringBuilder();
+
+        buf.append("kylin.version:").append(KylinVersion.getCurrentVersion()).append("\n");
+        buf.append("os.name:").append(System.getProperty("os.name")).append("\n");
+        buf.append("os.arch:").append(System.getProperty("os.arch")).append("\n");
+        buf.append("os.version:").append(System.getProperty("os.version")).append("\n");
+        buf.append("java.version:").append(System.getProperty("java.version")).append("\n");
+        buf.append("java.vendor:").append(System.getProperty("java.vendor"));
+
+        return buf.toString();
+    }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/kylin/blob/35c3e0fa/server/src/main/java/org/apache/kylin/rest/init/ClientInfoTask.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/init/ClientInfoTask.java b/server/src/main/java/org/apache/kylin/rest/init/ClientInfoTask.java
index 1877c7d..1cf54a3 100644
--- a/server/src/main/java/org/apache/kylin/rest/init/ClientInfoTask.java
+++ b/server/src/main/java/org/apache/kylin/rest/init/ClientInfoTask.java
@@ -31,9 +31,12 @@ public class ClientInfoTask extends InitialTask {
 
     @Override
     public void execute() {
+        logger.info(getClientDetailInformation());
+    }
+
+    public static String getClientDetailInformation() {
         StringBuilder buf = new StringBuilder();
 
-        buf.append("Client information:").append("\n");
         buf.append("kylin.version:").append(KylinVersion.getCurrentVersion()).append("\n");
         buf.append("os.name:").append(System.getProperty("os.name")).append("\n");
         buf.append("os.arch:").append(System.getProperty("os.arch")).append("\n");
@@ -43,7 +46,6 @@ public class ClientInfoTask extends InitialTask {
         buf.append("java.vendor:").append(System.getProperty("java.vendor")).append("\n");
         buf.append("java.library.path:").append(System.getProperty("java.library.path"));
 
-        logger.info(buf.toString());
+        return buf.toString();
     }
-
 }