Planner: ms-queuedaemon: Use chan-get-desc in chan-plan-info

This relieves the callers of the need to provide a desc.  This is
helpful because chan-note-unprocessed doesn't have one.

Overall functional change is to show the chan desc (ie, the client TCP
connection info) in the list of unprocessed clients.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
v2: New patch

diff --git a/ms-queuedaemon b/ms-queuedaemon
index fba28a11da35ff2f003479a66020a38c41b675da..29b906fc68c9f00781b397722a50e3fa2c35a28e 100755 (executable)
--- a/ms-queuedaemon
+++ b/ms-queuedaemon
@@ -375,7 +375,8 @@ proc cmd/get-last-plan {chan desc w} {
     return-plan-to-client $chan $w.final
 }
 
-proc chan-plan-info {chan desc} {
+proc chan-plan-info {chan} {
+    set desc [get-chan-desc $chan]
     set l {}
     lappend l [chan-get-info $chan {"$info(preinfo)"} ""]
     lappend l [chan-get-info $chan {"job $info(job)"} $desc]
@@ -388,7 +389,7 @@ proc cmd/book-resources {chan desc bytes} {
 proc do-book-resources {chan desc data} {
     global plan errorInfo
     set w [check-we-are-thinking $chan]
-    set info [chan-plan-info $plan $desc]
+    set info [chan-plan-info $chan]
     if {[catch {
        exec ./ms-planner -w$w book-resources $info << $data
     } emsg]} {
@@ -494,7 +495,7 @@ proc restarter-restart-now {} {
 }
 
 proc chan-note-unprocessed {w chan} {
-    exec ./ms-planner -w$w unprocessed [chan-plan-info $chan {}]
+    exec ./ms-planner -w$w unprocessed [chan-plan-info $chan]
 }
 
 proc notify-to-think {w thinking} {