From 4201f8e7e0ac3cb1fccccd2785fb32aac7311591 Mon Sep 17 00:00:00 2001
From: Christoph Schulthess
Date: Tue, 21 Feb 2017 16:18:45 +0100
Subject: debugconfig and -request

---
 apis/debugrequest.php                                    |  9 ++++++---
 inc/property.inc.php                                     |  2 +-
 modules-available/debugconfig/page.inc.php               | 10 ++++++----
 modules-available/debugconfig/templates/relaystatus.html |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/apis/debugrequest.php b/apis/debugrequest.php
index 8558de67..2396da78 100644
--- a/apis/debugrequest.php
+++ b/apis/debugrequest.php
@@ -16,9 +16,12 @@ if ($validclient == false) {
   http_response_code(400);
 } else {
   http_response_code(200);
-  $data = json_encode(array("hosts" => array($_SERVER["REMOTE_ADDR"], $debug_settings["debugServer"]), 
-	"ports" => array($port, intval($debug_settings["port"])), "descs" => array("bwlpclient", "debugserver")));
-  $taskstruct = Taskmanager::submit('DispatchRelay', $data, true);
+  $data = array("hosts" => array($_SERVER["REMOTE_ADDR"], $debug_settings["debugServer"]), 
+	"ports" => array($port, intval($debug_settings["port"])), "descs" => array("bwlpclient", "debugserver"));
+  $taskstruct = Taskmanager::submit('DispatchRelay', $data);
+  //$taskstruct = Taskmanager::submit('FantasyTask');
+  //$taskstruct = Taskmanager::submit('DummyTask');
+  error_log(print_r($taskstruct, true));
   Property::setDebugTaskStruct($taskstruct);
 }
 
diff --git a/inc/property.inc.php b/inc/property.inc.php
index 636a2bce..ec3c0612 100644
--- a/inc/property.inc.php
+++ b/inc/property.inc.php
@@ -208,6 +208,6 @@ class Property
 
 	public static function setDebugTaskStruct($value)
 	{
-		return self::set('debug-task-struct'), json_encode($value));
+		return self::set('debug-task-struct', json_encode($value));
 	}
 }
diff --git a/modules-available/debugconfig/page.inc.php b/modules-available/debugconfig/page.inc.php
index 00698d26..09ae0d7d 100644
--- a/modules-available/debugconfig/page.inc.php
+++ b/modules-available/debugconfig/page.inc.php
@@ -24,11 +24,13 @@ class Page_debugConfig extends Page
 	{
 		$debug_config = $this->getConfig();
 		Render::addTemplate('debugconfig', array("debugEnabled" => $debug_config["enabled"], "debugServer" => $debug_config["debugServer"], "port" => $debug_config["port"]));
-		if (gettype($taskstatus) == 'array') {
-			error_log(count($taskstatus));
-		}
+		
+		$task = Property::getDebugTaskStruct();
+		$taskid = $task['id'];
+		$taskstatus = Taskmanager::status($task);
+		error_log(print_r($taskstatus, true));
 
-		//Render::addTemplate('relaystatus', array("taskid" => $taskstatus));
+		Render::addTemplate('relaystatus', array("taskid" => $taskid, "taskstatus" => $taskstatus));
 	}
 	
 	private function getConfig()
diff --git a/modules-available/debugconfig/templates/relaystatus.html b/modules-available/debugconfig/templates/relaystatus.html
index 1e9221c7..60e4c494 100644
--- a/modules-available/debugconfig/templates/relaystatus.html
+++ b/modules-available/debugconfig/templates/relaystatus.html
@@ -1,6 +1,6 @@
 
 <div class="panel panel-default">
-	<div class="panel-heading">Relay Status</div>
+	<div class="panel-heading">Relay Status for task: {{taskid}}</div>
 	<div class="panel-body">
 		<div data-tm-id="{{taskid}}" data-tm-log="messages"></div>
 	</div>
-- 
cgit v1.2.3-55-g7522