dirty fixes for several parts of the input management

graylog-labs · Jan 13, 2014 · 62cd7d5 · 62cd7d5
1 parent 5025e99
commit 62cd7d5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/app/controllers/InputsController.java b/app/controllers/InputsController.java
@@ -25,6 +25,7 @@
 import lib.*;
 import models.*;
 import models.api.responses.system.InputTypeSummaryResponse;
+import play.Logger;
 import play.mvc.Result;
 
 import javax.ws.rs.WebApplicationException;
@@ -193,7 +194,7 @@ protected Map<String, Object> extractConfiguration(Map<String, String[]> form, I
         return configuration;
     }
 
-    public Result launch(String nodeId) {
+    public Result launch(String nodeIdParam) {
         final Map<String, String[]> form = request().body().asFormUrlEncoded();
 
         final String inputType = form.get("type")[0];
@@ -206,11 +207,21 @@ public Result launch(String nodeId) {
         try {
             ClusterEntity node = null;
             InputTypeSummaryResponse inputInfo = null;
-            if (form.get("node") != null && form.get("node").length > 0) {
+
+            String nodeId = null;
+            if(nodeIdParam != null && !nodeIdParam.isEmpty()) {
+                nodeId = nodeIdParam;
+            } else {
+                if(form.get("node") != null && form.get("node").length > 0) {
+                    nodeId = form.get("node")[0];
+                }
+            }
+
+            if (nodeId != null) {
                 try {
-                    node = nodeService.loadNode(form.get("node")[0]);
+                    node = nodeService.loadNode(nodeId);
                 } catch (NodeService.NodeNotFoundException e) {
-                    node = nodeService.loadRadio(form.get("node")[0]);
+                    node = nodeService.loadRadio(nodeId);
                 }
             }
 

diff --git a/conf/routes b/conf/routes
@@ -58,6 +58,7 @@ GET         /system/threaddump/:node_id
 GET         /system/threaddump/radio/:radio_id                                       @controllers.RadiosController.threadDump(radio_id: String)
 GET         /system/inputs                                                           @controllers.InputsController.index()
 POST        /system/inputs                                                           @controllers.InputsController.launch(node_id ?= "")
+POST        /system/inputs/:node_id                                                  @controllers.InputsController.launch(node_id: String)
 GET         /system/inputs/:node_id                                                  @controllers.InputsController.manage(node_id: String)
 GET         /system/inputs/radio/:radio_id                                           @controllers.InputsController.manageRadio(radio_id: String)
 POST        /system/inputs/radio/:radio_id                                           @controllers.InputsController.launchRadio(radio_id: String)