Update holer client

Author: WisdomFamily

Binary/Java/holer-client-v1.2.zip

@@ -34,13 +34,12 @@ Set HOLER_ENV = HOLER_WSH.Environment("USER")
 
 JAVA_BIN = "javaw"
 
-HOLER_HOME = HOLER_ENV("HOLER_HOME")
 HOLER_ACCESS_KEY = HOLER_ENV("HOLER_ACCESS_KEY")
 HOLER_SERVER_HOST = HOLER_ENV("HOLER_SERVER_HOST")
+HOLER_HOME = HOLER_ENV("HOLER_HOME")
 
 If HOLER_HOME = Empty Then
     HOLER_HOME = HOLER_FSO.GetFolder("..\").Path & "\"
-    HOLER_ENV("HOLER_HOME") = HOLER_HOME
 End If
 
 HOLER_APP = HOLER_HOME & "holer-client.jar"
@@ -120,6 +119,6 @@ Function LaunchHoler()
     '---------------------------------------------------
     ' Find holer daemon
     '---------------------------------------------------
-    HOLER_CMD = "cmd.exe /c echo Starting holer client... & timeout /T 4 /NOBREAK & echo " & HOLER_LINE & " & echo The running holer client: & tasklist | findstr " & JAVA_BIN & " & echo " & HOLER_LINE & " & pause"
+    HOLER_CMD = "cmd.exe /c echo Starting holer client... & timeout /T 3 /NOBREAK & echo " & HOLER_LINE & " & echo The running holer client: & tasklist | findstr " & JAVA_BIN & " & echo " & HOLER_LINE & " & pause"
     HOLER_WSH.Run HOLER_CMD, 1, True
 End Function

SourceCode/Java/holer-client/src/main/resources/bin/startup.vbs renamed to SourceCode/Java/holer-client/src/main/resources/bin/holer.vbs

@@ -21,12 +21,10 @@ cd `dirname $0`/..
 
 HOLER_OK=0
 HOLER_ERR=1
-
+HOLER_NAME="holer"
 HOLER_HOME=`pwd`
 HOLER_BIN=$HOLER_HOME/bin
-HOLER_CONF_DIR=$HOLER_HOME/conf
-HOLER_CONF=$HOLER_CONF_DIR/holer.conf
-HOLER_NAME="holer"
+HOLER_CONF=$HOLER_HOME/conf/holer.conf
 RC_INIT_DIR="/etc/rc.d/init.d"
 
 function input() 

SourceCode/Java/holer-client/src/main/resources/bin/setup.sh

@@ -29,7 +29,7 @@ Set HOLER_FSO = CreateObject("Scripting.FileSystemObject")
 Set HOLER_WSH = CreateObject("WScript.Shell")
 Set HOLER_ENV = HOLER_WSH.Environment("USER")
 
-HOLER_VBS_FILE = "startup.vbs"
+HOLER_VBS_FILE = "holer.vbs"
 HOLER_BOOT_DIR = "C:\ProgramData\Microsoft\Windows\Start Menu\Programs\StartUp\"
 HOLER_HOME = HOLER_FSO.GetFolder("..\").Path & "\"
 HOLER_CONF = HOLER_HOME & "conf\holer.conf"

SourceCode/Java/holer-client/src/main/resources/bin/setup.vbs

@@ -24,11 +24,9 @@ set HOLER_OK=0
 set HOLER_ERR=1
 set JAVA_BIN=java
 
-if "!HOLER_HOME!" equ "" (
-    set HOLER_HOME=%~dp0\..
-)
-
+set HOLER_HOME=%~dp0\..
 set HOLER_ARGS=-Dapp.home=!HOLER_HOME!
+set HOLER_CONF=!HOLER_HOME!\conf\holer.conf
 set HOLER_APP=!HOLER_HOME!\holer-client.jar
 set HOLER_LOG_DIR=!HOLER_HOME!\logs
 set HOLER_LOG=!HOLER_LOG_DIR!\holer-client.log
@@ -51,7 +49,12 @@ if !errorlevel! neq 0 (
     goto:eof
 )
 
-@REM  Asking for the HOLER_ACCESS_KEY
+@REM Set HOLER ENV
+if exist "!HOLER_CONF!" (
+    for /f "usebackq eol=# delims== tokens=1,*" %%i in ("!HOLER_CONF!") do set %%i=%%j
+)
+
+@REM Asking for the HOLER_ACCESS_KEY
 if "!HOLER_ACCESS_KEY!" equ "" (
     @echo !HOLER_LINE!
     set /p HOLER_ACCESS_KEY="Enter holer access key: "
@@ -61,9 +64,10 @@ if "!HOLER_ACCESS_KEY!" equ "" (
         pause
         exit /b !HOLER_ERR!
     )
+    @echo HOLER_ACCESS_KEY=!HOLER_ACCESS_KEY!> !HOLER_CONF!
 )
 
-@REM  Asking for the HOLER_SERVER_HOST
+@REM Asking for the HOLER_SERVER_HOST
 if "!HOLER_SERVER_HOST!" equ "" (
     @echo !HOLER_LINE!
     set /p HOLER_SERVER_HOST="Enter holer server host: "
@@ -73,13 +77,14 @@ if "!HOLER_SERVER_HOST!" equ "" (
         pause
         exit /b !HOLER_ERR!
     )
+    @echo HOLER_SERVER_HOST=!HOLER_SERVER_HOST!>> !HOLER_CONF!
 )
 
 @echo !HOLER_LINE!
 @echo Starting holer client...
 
 start /b !JAVA_BIN!w !HOLER_ARGS! -jar !HOLER_APP! >> !HOLER_LOG!
-timeout /T 4 /NOBREAK
+timeout /T 3 /NOBREAK
 
 @echo !HOLER_LINE!
 tasklist | findstr !JAVA_BIN!w

SourceCode/Java/holer-client/src/main/resources/bin/startup.bat

@@ -24,11 +24,10 @@ HOLER_ERR=1
 HOLER_PID=""
 
 HOLER_HOME=`pwd`
-HOLER_CONF_DIR=$HOLER_HOME/conf
-HOLER_CONF=$HOLER_CONF_DIR/holer.conf
 HOLER_LOG_DIR=$HOLER_HOME/logs
 HOLER_LOG=$HOLER_LOG_DIR/holer-client.log
 HOLER_APP=$HOLER_HOME/holer-client.jar
+HOLER_CONF=$HOLER_HOME/conf/holer.conf
 HOLER_ARGS="-Dapp.home=$HOLER_HOME"
 
 function pid() 
@@ -48,6 +47,10 @@ function status()
 
 function input() 
 {
+    if [ -f $HOLER_CONF ]; then
+        . $HOLER_CONF
+    fi
+
     # Asking for the holer access key
     if [ "$HOLER_ACCESS_KEY" == "" ]; then
         echo "Enter holer access key:"
@@ -73,10 +76,6 @@ function input()
 
 function start() 
 {
-    if [ -f $HOLER_CONF ]; then
-        . $HOLER_CONF
-    fi
-
     if [ ! -d $HOLER_LOG_DIR ]; then
         mkdir -p $HOLER_LOG_DIR
     fi

SourceCode/Java/holer-client/src/main/resources/bin/startup.sh

@@ -1,2 +1,3 @@
-HOLER_ACCESS_KEY=
-HOLER_SERVER_HOST=
+HOLER_ACCESS_KEY=HOLER_CLIENT-2F8D8B78B3C2A0AE
+HOLER_SERVER_HOST=www.holer.org
+HOLER_SERVER_PORT=6060

SourceCode/Java/holer-client/src/main/resources/conf/holer.conf

@@ -95,7 +95,8 @@ public void initConfig(String confFile)
 
     public String strValue(String key)
     {
-        return this.holerConf.getProperty(key);
+        String value = this.holerConf.getProperty(key);
+        return StringUtils.trim(value);
     }
 
     public String strValue(String key, String defaultValue)
@@ -110,7 +111,7 @@ public String strValue(String key, String defaultValue)
 
     public Integer intValue(String key)
     {
-        String value = this.holerConf.getProperty(key);
+        String value = this.strValue(key);
         if (StringUtils.isEmpty(value))
         {
             return null;
@@ -134,7 +135,7 @@ public int intValue(String key, int defaultValue)
 
     public Boolean boolValue(String key)
     {
-        String value = this.holerConf.getProperty(key);
+        String value = this.strValue(key);
         if (StringUtils.isBlank(value))
         {
             return null;

SourceCode/Java/holer-common/src/main/java/org/holer/common/util/HolerConfig.java

@@ -32,7 +32,7 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.39.Final</version>
+            <version>4.1.41.Final</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>