Merge branch 'AuraRobotics-viewer-event-logger' into master

Author: Luis Gustavo Nardin

.gitignore

@@ -10,7 +10,7 @@ hs_err_pid*
 build
 bin
 
-# IntelliJ
+# IntelliJ project
 *.iml
 *.ipr
 *.iws
@@ -21,13 +21,21 @@ bin
 .project
 .classpath
 
+# Gradle
+.gradle
+
 # Visual Studio Code
 .vscode
 
+# Theia IDE
+.theia
+
 # General MacOS
 .DS_Store
 .AppleDouble
 .LSOverride
 
 # Project
-jars
+boot/logs
+boot/records
+jars

boot/functions.sh

@@ -67,6 +67,7 @@ function printUsage {
 # Process command-line arguments
 function processArgs {
     LOGDIR="logs"
+    RECORDSDIR="records"
     MAP="$BASEDIR/maps/gml/test/map"
     CONFIGDIR="$BASEDIR/maps/gml/test/config"
     TEAM=""
@@ -94,6 +95,10 @@ function processArgs {
                 LOGDIR="$2"
                 shift 2
                 ;;
+            -r | --records)
+                RECORDSDIR="$2"
+                shift 2
+                ;;
             -t | --team)
                 TEAM="$2"
                 shift 2
@@ -153,6 +158,7 @@ function processArgs {
         LOGDIR=`readlink -f $LOGDIR`
     fi
     mkdir -p $LOGDIR
+    mkdir -p $RECORDSDIR
 }
 
 function execute {
@@ -236,3 +242,21 @@ function startViewer {
     echo "waiting for viewer to connect..."
     waitFor $LOGDIR/viewer-out.log "success"
 }
+
+
+# Start the viewer event logger
+function startViewerEventLogger {
+    if [[ $NOGUI == "yes" ]]; then
+        return 0
+    fi
+
+    makeClasspath $BASEDIR/lib
+
+    TEAM_NAME_ARG=""
+    if [ ! -z "$TEAM" ]; then
+        TEAM_NAME_ARG="\"--viewer.team-name=$TEAM\""
+    fi
+
+    # Execute the viewer
+    execute viewer "java -Xmx512m -cp $CP:$BASEDIR/jars/rescuecore2.jar:$BASEDIR/jars/standard.jar:$BASEDIR/jars/sample.jar -Dlog4j.log.dir=$LOGDIR rescuecore2.LaunchComponents sample.SampleViewerEventLogger -c $CONFIGDIR/viewer.cfg --records.dir=$RECORDSDIR $TEAM_NAME_ARG $*"
+}

boot/records/test__1598630733534_viewer_event_log.jlog

@@ -12,6 +12,7 @@ sh kill.sh
 startKernel --nomenu
 startSims
 startViewer
+startViewerEventLogger
 
 echo "Start your agents"
 waitFor $LOGDIR/kernel.log "Kernel has shut down" 30

boot/start.sh

@@ -9,6 +9,7 @@ version = '1.3'
 dependencies {
   runtimeOnly fileTree( dir: new File( rootDir, 'jars' ), include: '*.jar' )
   implementation fileTree( dir: new File( rootDir, 'lib' ), include: '*.jar' )
+  compile group: 'org.json', name: 'json', version: '20200518'
 
   testImplementation 'junit:junit:4.12'
 }