LP1825891 Hatch 'hostname' command

Returns the hostname as reported by Java:

InetAddress.getLocalHost().getHostName();

Includes hostname request in TestJava program.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jason Boyer <JBoyer@equinoxinitiative.org>

diff --git a/src/org/evergreen_ils/hatch/RequestHandler.java b/src/org/evergreen_ils/hatch/RequestHandler.java
index e2569cc..9fcd24d 100644 (file)
--- a/src/org/evergreen_ils/hatch/RequestHandler.java
+++ b/src/org/evergreen_ils/hatch/RequestHandler.java
@@ -18,6 +18,8 @@ package org.evergreen_ils.hatch;
 import org.json.*;
 import java.io.File;
 import java.util.logging.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 /**
  * Dispatches requests received via MessageIO, sends responses back 
@@ -171,6 +173,16 @@ public class RequestHandler extends Thread {
                 }
                 break;
 
+            case "hostname":
+                try {
+                    String hostname = InetAddress.getLocalHost().getHostName();
+                    response.put("content", hostname);
+                } catch (UnknownHostException e) {
+                    response.put("status", 500);
+                    response.put("message", "Cannot determine hostname " + e);
+                }
+                break;
+
             default:
                 response.put("status", 404); 
                 response.put("message", "Action not found: " + action);

diff --git a/src/org/evergreen_ils/hatch/TestHatch.java b/src/org/evergreen_ils/hatch/TestHatch.java
index ee85154..1f9ca79 100644 (file)
--- a/src/org/evergreen_ils/hatch/TestHatch.java
+++ b/src/org/evergreen_ils/hatch/TestHatch.java
@@ -120,6 +120,17 @@ public class TestHatch {
 
         pause();
 
+        // get the hostname
+        obj = new JSONObject();
+        obj.put("msgid", msgid++);
+        obj.put("clientid", clientid);
+        obj.put("origin", origin);
+        obj.put("action", "hostname");
+        io.sendMessage(obj);
+
+        pause();
+
+
         /*
         // Printing tests