Merge pull request #33 from dist-sys/fix_issue32

Fix issue32 and log problem

Author: nabon

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 wrapper {
-    gradleVersion = '7.6'
+    gradleVersion = '8.2'
 }
 
 mainClassName = 'mqttloader.Loader'
@@ -33,7 +33,7 @@ CreateStartScripts startScripts = project.startScripts
 startScripts.with {
     doLast {
         unixScript.text = unixScript.text.replaceFirst('-Djava.util.logging.config.file=src/dist/logging.properties',
-                '-Djava.util.logging.config.file=\\$APP_HOME/logging.properties')
+                '-Djava.util.logging.config.file=\'\"\\$APP_HOME\"\'/logging.properties')
         windowsScript.text = windowsScript.text.replaceFirst('-Djava.util.logging.config.file=src/dist/logging.properties',
                 '-Djava.util.logging.config.file=%~dp0../logging.properties')
     }

doc/usage_en.md

@@ -1,4 +1,4 @@
-# MQTTLoader usage (v0.8.5)
+# MQTTLoader usage (v0.8.6)
 MQTTLoader is a load testing tool (client tool) for MQTT.  
 It supports both MQTT v5.0 and v3.1.1.  
 From v0.8.0, it supports TLS authentication.
@@ -13,7 +13,7 @@ Download the archive file (zip or tar) from: https://github.com/dist-sys/mqttloa
 Below is an example of downloading by using curl command.
 
 ```
-$ curl -OL https://github.com/dist-sys/mqttloader/releases/download/v0.8.5/mqttloader-0.8.5.zip
+$ curl -OL https://github.com/dist-sys/mqttloader/releases/download/v0.8.6/mqttloader-0.8.6.zip
 ```
 
 By extracting it, you can get the following files.

doc/usage_jp.md

@@ -1,4 +1,4 @@
-# MQTTLoader 利用方法 (v0.8.5)
+# MQTTLoader 利用方法 (v0.8.6)
 MQTTLoaderは、MQTT v5.0とv3.1.1に対応した負荷テストツール（クライアントツール）です。  
 v0.8.0から、ブローカとのTLS接続にも対応しました。
 
@@ -14,7 +14,7 @@ https://github.com/dist-sys/mqttloader/releases
 以下は、Curlコマンドを使ってダウンロードする場合の例です。
 
 ```
-$ curl -OL https://github.com/dist-sys/mqttloader/releases/download/v0.8.5/mqttloader-0.8.5.zip
+$ curl -OL https://github.com/dist-sys/mqttloader/releases/download/v0.8.6/mqttloader-0.8.6.zip
 ```
 
 ダウンロードしたファイルを解凍すると、以下のディレクトリ構造が得られます。

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -133,26 +130,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew

@@ -19,7 +19,7 @@
 import java.text.SimpleDateFormat;
 
 public class Constants {
-    public static final String VERSION = "0.8.5";
+    public static final String VERSION = "0.8.6";
     public static final String BROKER_PREFIX_TCP = "tcp://";
     public static final String BROKER_PREFIX_TLS = "ssl://";
     public static final String BROKER_PORT_TCP = "1883";

src/main/java/mqttloader/Constants.java

@@ -429,6 +429,7 @@ private void startMeasurement() {
 
         measurementStartTime = Util.getCurrentTimeWithOffset().plusMillis(delay);
         lastRecvTime = measurementStartTime;
+		recorder.writeStartTime();
 
 		// publish interval in micro seconds.
 		int interval = Util.getPropValueInt(Prop.INTERVAL);

src/main/java/mqttloader/Loader.java

@@ -57,19 +57,21 @@ public Recorder(File file, boolean inMemory) {
         }
     }
 
+    public void writeStartTime(){
+        if(!inMemory) {
+            try {
+                bw.write(Util.getEpochMicros(Loader.measurementStartTime) + ",,,");
+                bw.newLine();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     @Override
     public void run() {
         thread = Thread.currentThread();
 
-		if(!inMemory) {
-			try {
-				bw.write(Util.getEpochMicros(Loader.measurementStartTime) + ",,,");
-				bw.newLine();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-
         Record record = null;
         while (true) {
             try {

src/main/java/mqttloader/Recorder.java

@@ -22,7 +22,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
-import mqttloader.Constants;
 import mqttloader.Loader;
 import mqttloader.Record;
 import mqttloader.Recorder;