Skip to content

Commit ebaf390

Browse files
authored
Merge pull request #12 from tstromberg/master
Migrate from glog to klog, update usage doc
2 parents d2fe833 + aed2513 commit ebaf390

File tree

8 files changed

+5843
-5820
lines changed

8 files changed

+5843
-5820
lines changed

Diff for: README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,19 @@ Install slowjam:
6262
Analyze a stacklog using the interactive webserver:
6363

6464
```shell
65-
slowjam -http localhost:8080 /path/to/stack.slog
65+
slowjam --http localhost:8080 /path/to/stack.slog
6666
```
6767

6868
To output a Gantt/Flamegraph chart to `out.html`:
6969

7070
```shell
71-
slowjam -html out.html /path/to/stack.slog
71+
slowjam --html out.html /path/to/stack.slog
7272
```
7373

7474
To output a text summary to `out.txt`:
7575

7676
```shell
77-
slowjam -html out.txt /path/to/stack.slog
77+
slowjam --html out.txt /path/to/stack.slog
7878
```
7979

8080
## Real World Examples

Diff for: cmd/slowjam/slowjam.go

+13-12
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"fmt"
2121
"os"
2222

23-
"github.com/golang/glog"
2423
"github.com/spf13/pflag"
24+
"k8s.io/klog/v2"
2525

2626
"github.com/google/slowjam/pkg/pprof"
2727
"github.com/google/slowjam/pkg/stacklog"
@@ -39,30 +39,31 @@ var (
3939
)
4040

4141
func main() {
42+
klog.InitFlags(nil)
43+
pflag.Parse()
44+
4245
s := stacklog.MustStartFromEnv("STACKLOG_PATH")
4346
defer s.Stop()
4447

45-
pflag.Parse()
46-
4748
if len(pflag.Args()) != 1 {
4849
fmt.Fprintln(os.Stderr, "usage: slowjam [flags] <path>")
4950
os.Exit(64) // EX_USAGE
5051
}
5152

5253
f, err := os.Open(pflag.Args()[0])
5354
if err != nil {
54-
glog.Fatalf("open: %v", err)
55+
klog.Fatalf("open: %v", err)
5556
}
5657

5758
defer func() {
5859
if err := f.Close(); err != nil {
59-
glog.Errorf("close failed: %v", err)
60+
klog.Errorf("close failed: %v", err)
6061
}
6162
}()
6263

6364
samples, err := stackparse.Read(f)
6465
if err != nil {
65-
glog.Fatalf("parse: %v", err)
66+
klog.Fatalf("parse: %v", err)
6667
}
6768

6869
tl := stackparse.CreateTimeline(samples, stackparse.SuggestedIgnore, *goroutines)
@@ -75,12 +76,12 @@ func main() {
7576
if *htmlPath != "" {
7677
w, err := os.Create(*htmlPath)
7778
if err != nil {
78-
glog.Exitf("open failed: %v", err)
79+
klog.Exitf("open failed: %v", err)
7980
}
8081
defer w.Close()
8182

8283
if err := web.Render(w, tl); err != nil {
83-
glog.Fatalf("render: %v", err)
84+
klog.Fatalf("render: %v", err)
8485
}
8586

8687
return
@@ -89,17 +90,17 @@ func main() {
8990
if *pprofPath != "" {
9091
w, err := os.Create(*pprofPath)
9192
if err != nil {
92-
glog.Exitf("open failed: %v", err)
93+
klog.Exitf("open failed: %v", err)
9394
}
9495
defer w.Close()
9596

9697
bs, err := pprof.Render(samples, stackparse.SuggestedIgnore, *goroutines)
9798
if err != nil {
98-
glog.Fatalf("render: %v", err)
99+
klog.Fatalf("render: %v", err)
99100
}
100101

101102
if _, err := w.Write(bs); err != nil {
102-
glog.Fatalf("write: %v", err)
103+
klog.Fatalf("write: %v", err)
103104
}
104105

105106
return
@@ -110,5 +111,5 @@ func main() {
110111
return
111112
}
112113

113-
glog.Exitf("no output mode specified")
114+
klog.Exitf("no output mode specified")
114115
}

0 commit comments

Comments
 (0)