Skip to content

Commit ab6917d

Browse files
committed
Improve output format
1 parent 2308dca commit ab6917d

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

pkg/checkers/checker.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ package checker
22

33
import (
44
"errors"
5-
"log"
5+
6+
log "github.com/sirupsen/logrus"
67

78
"github.com/Azure/kdebug/pkg/base"
89
)
@@ -26,7 +27,7 @@ func Check(ctx *base.CheckContext, checkerNames []string) ([]*base.CheckResult,
2627
for _, checker := range checkers {
2728
r, err := checker.Check(ctx)
2829
if err != nil {
29-
log.Printf("Error in checker %s: %s", checker.Name(), err)
30+
log.Warnf("Checker(%s): %s", checker.Name(), err)
3031
}
3132
results = append(results, r...)
3233
}

pkg/tools/upgradeinspector/upgradeinspector.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ func (t *UpgradeInspectTool) parseResult(result string) string {
8686
if logNum == 0 {
8787
sb.WriteString(color.GreenString("\nNo package upgrade log found\n"))
8888
} else {
89-
sb.WriteString(fmt.Sprintf("\n%-19s\t%-30s\t%-20s\t%-20s\n\n", columns[0], columns[1], columns[2], columns[3]))
89+
sb.WriteString(fmt.Sprintf("\n%-19s\t%-40s\t%-30s\t%-30s\n\n", columns[0], columns[1], columns[2], columns[3]))
9090
}
9191

9292
for i := 0; i < logNum && i < t.recordLimit; i++ {
9393
strs := strings.Split(logs[i], " ")
94-
sb.WriteString(fmt.Sprintf("%v-%v\t%-30s\t%-20s\t%-20s\n", strs[0], strs[1], strs[3], strs[4], strs[5]))
94+
sb.WriteString(fmt.Sprintf("%v-%v\t%-40s\t%-30s\t%-30s\n", strs[0], strs[1], strs[3], strs[4], strs[5]))
9595
}
9696
if t.recordLimit < logNum {
9797
sb.WriteString(color.YellowString("\n%v package(s) omitted\n", logNum-t.recordLimit))

pkg/tools/upgradeinspector/upgradeinspector_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ func TestUpgradeParser_Success(t *testing.T) {
2323
logs := fmt.Sprintf("%s 17:12:13 upgrade libubsan1:amd64 12-20220319-1ubuntu1 12.1.0-2ubuntu1~22.04\n", dateStr) +
2424
fmt.Sprintf("%s 17:12:13 upgrade gcc-12-base:amd64 12-20220319-1ubuntu1 12.1.0-2ubuntu1~22.04\n", dateStr)
2525

26-
expected := fmt.Sprintf("\n%-19s\t%-30s\t%-20s\t%-20s\n\n", "Timestamp", "Package", "OldVer", "NewVer") +
27-
fmt.Sprintf("%v-%v\t%-30s\t%-20s\t%-20s\n", dateStr, "17:12:13", "libubsan1:amd64", "12-20220319-1ubuntu1", "12.1.0-2ubuntu1~22.04") +
28-
fmt.Sprintf("%v-%v\t%-30s\t%-20s\t%-20s\n", dateStr, "17:12:13", "gcc-12-base:amd64", "12-20220319-1ubuntu1", "12.1.0-2ubuntu1~22.04")
26+
expected := fmt.Sprintf("\n%-19s\t%-40s\t%-30s\t%-30s\n\n", "Timestamp", "Package", "OldVer", "NewVer") +
27+
fmt.Sprintf("%v-%v\t%-40s\t%-30s\t%-30s\n", dateStr, "17:12:13", "libubsan1:amd64", "12-20220319-1ubuntu1", "12.1.0-2ubuntu1~22.04") +
28+
fmt.Sprintf("%v-%v\t%-40s\t%-30s\t%-30s\n", dateStr, "17:12:13", "gcc-12-base:amd64", "12-20220319-1ubuntu1", "12.1.0-2ubuntu1~22.04")
2929

3030
output := upgradeInspectTool.parseResult(logs)
3131

0 commit comments

Comments
 (0)