From 63e3a69611f814aee20d8a8b31abe2d00e1902fb Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Sat, 4 Apr 2020 15:58:16 +0200 Subject: [PATCH] BackgroundDaemonDetails: support RPC info --- library/Director/Web/Widget/BackgroundDaemonDetails.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/library/Director/Web/Widget/BackgroundDaemonDetails.php b/library/Director/Web/Widget/BackgroundDaemonDetails.php index 53d65452..323ee002 100644 --- a/library/Director/Web/Widget/BackgroundDaemonDetails.php +++ b/library/Director/Web/Widget/BackgroundDaemonDetails.php @@ -97,7 +97,13 @@ class BackgroundDaemonDetails extends BaseHtmlElement ))); $this->add(Html::tag('h2', $this->translate('Process List'))); - $processes = \json_decode($this->daemon->process_info); + if (\is_string($this->daemon->process_info)) { + // from DB: + $processes = \json_decode($this->daemon->process_info); + } else { + // via RPC: + $processes = $this->daemon->process_info; + } $table = new Table(); $table->add(Html::tag('thead', Html::tag('tr', Html::wrapEach([ 'PID',