Merge pull request #44 from sourceplusplus/dev

v0.4.3

Author: BFergerson

README.md

@@ -54,7 +54,7 @@ Commands:
   add        Add live instruments/views
   get        Get live instruments/views
   remove     Remove live instruments/views
-  subscribe  Subscribe to live instrument/view streams
+  subscribe  Subscribe to live instrument/view events
   version    Display version information
 ```
 

gradle.properties

@@ -1,7 +1,7 @@
 kotlin.code.style=official
 
 cliGroup=com.sourceplusplus
-projectVersion=0.4.2
+projectVersion=0.4.3
 
 vertxVersion=4.2.4
 graalVersion = 21.3.0

src/main/kotlin/spp/cli/commands/developer/Subscribe.kt

@@ -19,6 +19,6 @@ package spp.cli.commands.developer
 
 import com.github.ajalt.clikt.core.CliktCommand
 
-class Subscribe : CliktCommand(help = "Subscribe to live instrument/view streams") {
+class Subscribe : CliktCommand(help = "Subscribe to live instrument/view events") {
     override fun run() = Unit
 }

src/main/kotlin/spp/cli/commands/developer/view/SubscribeView.kt

@@ -130,7 +130,7 @@ class SubscribeView : CliktCommand(
             if (value == null) value = metric.getNumber("value").toString()
 
             val metricType = metric.getJsonObject("meta").getString("metricsName")
-            println("$eventTime ${metric.getString("entityId")} ($metricType): $value")
+            println("$eventTime ${metric.getString("entityName")} ($metricType): $value")
         }
     }