Mercurial > hg > thermostat-ng > agent

changeset 2732:bfd9802cd494

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use correct URL for updating stopped JVMs. Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-August/024474.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Tue, 08 Aug 2017 17:12:26 +0200
parents 406fe8f9d8bf
children 4a55900090e4
files plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/internal/model/VmInfoDAOImpl.java plugins/jvm-overview/agent/src/test/java/com/redhat/thermostat/jvm/overview/agent/internal/model/VmInfoDAOImplTest.java
diffstat 2 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/internal/model/VmInfoDAOImpl.java	Thu Aug 03 19:56:40 2017 +0200
+++ b/plugins/jvm-overview/agent/src/main/java/com/redhat/thermostat/jvm/overview/agent/internal/model/VmInfoDAOImpl.java	Tue Aug 08 17:12:26 2017 +0200
@@ -68,7 +68,6 @@
     private static final String PLUGIN_ID = "jvm-overview";
     private static final String SYSTEM_PATH = "systems/";
     private static final String VM_PATH = "/jvms/";
-    private static final String UPDATE_PREFIX = "update/";
 
     private final Logger logger = LoggingUtils.getLogger(VmInfoDAOImpl.class);
     
@@ -126,14 +125,14 @@
 
     @Override
     public void putVmStoppedTime(final String agentId, final String vmId, final long timestamp) {
+        URI uri = getUpdateURI(vmId);
         try {
             // Encode as JSON and send as PUT request
             VmInfoUpdate update = new VmInfoUpdate(timestamp);
             String json = jsonHelper.toJson(update);
-            URI uri = getUpdateURI(vmId);
             httpRequestService.sendHttpRequest(json, uri, HttpRequestService.Method.PUT);
         } catch (IOException | RequestFailedException e) {
-           logger.log(Level.WARNING, "Failed to send JVM information update to web gateway", e);
+           logger.log(Level.WARNING, "Failed to send JVM information update to web gateway at: " + uri, e);
         }
     }
     
@@ -146,7 +145,6 @@
 
     private URI getUpdateURI(String vmId) {
         StringBuilder builder = new StringBuilder();
-        builder.append(UPDATE_PREFIX);
         builder.append(SYSTEM_PATH);
         builder.append(systemID.getSystemID());
         builder.append(VM_PATH);
--- a/plugins/jvm-overview/agent/src/test/java/com/redhat/thermostat/jvm/overview/agent/internal/model/VmInfoDAOImplTest.java	Thu Aug 03 19:56:40 2017 +0200
+++ b/plugins/jvm-overview/agent/src/test/java/com/redhat/thermostat/jvm/overview/agent/internal/model/VmInfoDAOImplTest.java	Tue Aug 08 17:12:26 2017 +0200
@@ -66,7 +66,7 @@
 
     private static final URI GATEWAY_URI = URI.create("http://localhost:30000/jvms/0.0.1/");
     private static final URI POST_URI = GATEWAY_URI.resolve("systems/foo");
-    private static final URI UPDATE_URI = GATEWAY_URI.resolve("update/systems/foo/jvms/vmId");
+    private static final URI UPDATE_URI = GATEWAY_URI.resolve("systems/foo/jvms/vmId");
     private static final String SOME_JSON = "{\"some\" : \"json\"}";
     private static final String SOME_OTHER_JSON = "{\"some\" : {\"other\" : \"json\"}}";