Merge pull request docker#98 from aaronlehmann/logs-padding-underflow

service: Avoid underflow in logs padding calculation
clnperez · May 16, 2017 · ebbab14 · ebbab14
2 parents 37bf8ff + ab6bc5d
commit ebbab14
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/cli/command/service/logs.go b/cli/command/service/logs.go
@@ -204,8 +204,12 @@ func (f *taskFormatter) format(ctx context.Context, logCtx logContext) (string,
 		}
 	}
 
-	padding := strings.Repeat(" ", f.padding-getMaxLength(task.Slot))
-	formatted := fmt.Sprintf("%s@%s%s", taskName, nodeName, padding)
+	paddingCount := f.padding - getMaxLength(task.Slot)
+	padding := ""
+	if paddingCount > 0 {
+		padding = strings.Repeat(" ", paddingCount)
+	}
+	formatted := taskName + "@" + nodeName + padding
 	f.cache[logCtx] = formatted
 	return formatted, nil
 }