ms-queuedaemon: Update for newer Tcl's socket channel ids

Now we have things like "sock55599edaf050" where previously we had
something like "sock142".  So the output is misaligned.

Bump the sizes.  And with these longer names, when showing the front
of the queue only print the full first entry and the start of the next
one.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/ms-queuedaemon b/ms-queuedaemon
index a3a009caa9b5322389ca3ce88b72e66da7844e6d..dc85886353e3de3bc2d035cc21f1c3a7513b7795 100755 (executable)
--- a/ms-queuedaemon
+++ b/ms-queuedaemon
@@ -91,7 +91,7 @@ proc log-event {m} {
 proc log-state {m} {
     global need_queue_run queue
 
-    set lhs [format "N=%d Q=%d (%-15.15s) " \
+    set lhs [format "N=%d Q=%d (%-20.20s) " \
                  $need_queue_run [llength $queue] $queue]
 
     foreach-walker w {
@@ -99,13 +99,13 @@ proc log-state {m} {
        if {[info exists queue_running]} {
            append lhs [format "R=%-3d " [llength $queue_running]]
            if {[info exists thinking]} {
-               append lhs [format "T=%-7s " $thinking]
+               append lhs [format "T=%-16s " $thinking]
            } else {
-               append lhs [format "          "]
+               append lhs [format "                   "]
            }
-           append lhs [format "(%-15.15s) " $queue_running]
+           append lhs [format "(%-20.20s) " $queue_running]
        } else {
-           append lhs "                                  "
+           append lhs "                                                "
        }
     }