MSK-488 KillSwitch Info/Management page

anotheria · Mar 15, 2019 · 7c2824b · 7c2824b
1 parent f72c8b3
commit 7c2824b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/...-webui/src/main/java/net/anotheria/moskito/webui/more/action/SwitchKillSettingAction.java b/...-webui/src/main/java/net/anotheria/moskito/webui/more/action/SwitchKillSettingAction.java
@@ -30,6 +30,8 @@ public ActionCommand execute(ActionMapping mapping, FormBean formBean, HttpServl
 
 		if ("disableMetricCollection".equals(name))
 			killSwitchConfiguration.setDisableMetricCollection(val);
+		else if ("disableTracing".equals(name))
+			killSwitchConfiguration.setDisableTracing(val);
 
 		getAdditionalFunctionalityAPI().setKillSwitchConfiguration(killSwitchConfiguration);
 

diff --git a/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/jsp/KillSwitch.jsp b/moskito-webui/src/main/java/net/anotheria/moskito/webui/more/jsp/KillSwitch.jsp
@@ -14,14 +14,22 @@
         </ano:notPresent>
 
         <ano:present name="killSwitchConfiguration">
-        <div class="box">
-            <div class="box-content paddner">
-                <dl class="dl-horizontal">
-                    <dt>Disable metric collection</dt>
-                    <dd><input type="checkbox" class="js-switch-color" data-switcher="disableMetricCollection" <ano:equal name="killSwitchConfiguration" property="disableMetricCollection" value="true">checked</ano:equal> /></dd>
-                </dl>
+            <div class="box">
+                <div class="box-content paddner">
+                    <dl class="dl-horizontal">
+                        <dt>Disable metric collection</dt>
+                        <dd><input type="checkbox" class="js-switch-color" data-switcher="disableMetricCollection" <ano:equal name="killSwitchConfiguration" property="disableMetricCollection" value="true">checked</ano:equal> /></dd>
+                    </dl>
+                </div>
+            </div>
+            <div class="box">
+                <div class="box-content paddner">
+                    <dl class="dl-horizontal">
+                        <dt>Disable tracing</dt>
+                        <dd><input type="checkbox" class="js-switch-color" data-switcher="disableTracing" <ano:equal name="killSwitchConfiguration" property="disableTracing" value="true">checked</ano:equal> /></dd>
+                    </dl>
+                </div>
             </div>
-        </div>
         </ano:present>
     </div>