global probe remote listener

Author: BFergerson

control/src/main/kotlin/spp/probe/SourceProbe.kt

@@ -52,7 +52,7 @@ object SourceProbe {
 
     private val BUILD = ResourceBundle.getBundle("build")
     private var PROBE_DIRECTORY = File(
-        if (System.getProperty("os.name").lowercase(Locale.getDefault()).startsWith("mac"))
+        if (System.getProperty("os.name").lowercase().startsWith("mac"))
             "/tmp" else System.getProperty("java.io.tmpdir"), "spp-probe"
     )
     var instrumentation: Instrumentation? = null
@@ -214,14 +214,14 @@ object SourceProbe {
                         ).onComplete {
                             if (it.succeeded()) {
                                 FrameHelper.sendFrame(
-                                    BridgeEventType.SEND.name.lowercase(Locale.getDefault()),
+                                    BridgeEventType.SEND.name.lowercase(),
                                     frame.getString("replyAddress"),
                                     JsonObject.mapFrom(it.result().body()),
                                     socket.result()
                                 )
                             } else {
                                 FrameHelper.sendFrame(
-                                    BridgeEventType.SEND.name.lowercase(Locale.getDefault()),
+                                    BridgeEventType.SEND.name.lowercase(),
                                     frame.getString("replyAddress"),
                                     JsonObject.mapFrom(it.cause()),
                                     socket.result()
@@ -266,15 +266,21 @@ object SourceProbe {
 
                 //register remotes
                 FrameHelper.sendFrame(
-                    BridgeEventType.REGISTER.name.lowercase(Locale.getDefault()),
+                    BridgeEventType.REGISTER.name.lowercase(),
+                    ProbeAddress.LIVE_INSTRUMENT_REMOTE.address,
+                    JsonObject(),
+                    tcpSocket
+                )
+                FrameHelper.sendFrame(
+                    BridgeEventType.REGISTER.name.lowercase(),
                     ProbeAddress.LIVE_INSTRUMENT_REMOTE.address + ":" + PROBE_ID,
                     JsonObject(),
                     tcpSocket
                 )
                 consumer.unregister()
             }
             FrameHelper.sendFrame(
-                BridgeEventType.SEND.name.lowercase(Locale.getDefault()), PlatformAddress.PROBE_CONNECTED.address,
+                BridgeEventType.SEND.name.lowercase(), PlatformAddress.PROBE_CONNECTED.address,
                 replyAddress, JsonObject(), true, JsonObject.mapFrom(pc), socket.result()
             )
         }

control/src/main/kotlin/spp/probe/control/LiveInstrumentRemote.kt

@@ -94,7 +94,11 @@ class LiveInstrumentRemote : AbstractVerticle() {
             e.printStackTrace()
             throw RuntimeException(e)
         }
-        vertx.eventBus()
+
+        vertx.eventBus() //global instrument remote
+            .localConsumer<JsonObject>(ProbeAddress.LIVE_INSTRUMENT_REMOTE.address)
+            .handler { handleInstrumentationRequest(it) }
+        vertx.eventBus() //probe specific instrument remote
             .localConsumer<JsonObject>(ProbeAddress.LIVE_INSTRUMENT_REMOTE.address + ":" + SourceProbe.PROBE_ID)
             .handler { handleInstrumentationRequest(it) }
     }
@@ -149,7 +153,7 @@ class LiveInstrumentRemote : AbstractVerticle() {
         private val EVENT_CONSUMER = BiConsumer(fun(address: String?, json: String?) {
             if (ProbeConfiguration.isNotQuite) println("Publishing event: $address, $json")
             FrameHelper.sendFrame(
-                BridgeEventType.PUBLISH.name.lowercase(Locale.getDefault()),
+                BridgeEventType.PUBLISH.name.lowercase(),
                 address,
                 JsonObject(json),
                 SourceProbe.tcpSocket