luciano/d2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move to timelib.WithTimeout

Browse source
This commit is contained in:
Gavin Nishizawa 2023-06-14 11:47:43 -07:00
parent 19cc5ee0e2
commit fcd4fefb64
No known key found for this signature in database
GPG key ID: AE3B177777CE55CD
5 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
d2cli/main.go
View file

@ -32,12 +32,12 @@ import (
"oss.terrastruct.com/d2/d2themes/d2themescatalog"
"oss.terrastruct.com/d2/lib/background"
"oss.terrastruct.com/d2/lib/imgbundler"
"oss.terrastruct.com/d2/lib/log"
ctxlog "oss.terrastruct.com/d2/lib/log"
"oss.terrastruct.com/d2/lib/pdf"
"oss.terrastruct.com/d2/lib/png"
"oss.terrastruct.com/d2/lib/pptx"
"oss.terrastruct.com/d2/lib/textmeasure"
timelib "oss.terrastruct.com/d2/lib/time"
"oss.terrastruct.com/d2/lib/version"
"oss.terrastruct.com/d2/lib/xgif"
@ -307,7 +307,7 @@ func Run(ctx context.Context, ms *xmain.State) (err error) {
return w.run()
}
ctx, cancel := log.WithTimeout(ctx, time.Minute*2)
ctx, cancel := timelib.WithTimeout(ctx, time.Minute*2)
defer cancel()
_, written, err := compile(ctx, ms, plugin, renderOpts, fontFamily, *animateIntervalFlag, inputPath, outputPath, *bundleFlag, *forceAppendixFlag, pw.Page)

4
d2plugin/exec.go
View file

@ -15,7 +15,7 @@ import (
"oss.terrastruct.com/util-go/xmain"
"oss.terrastruct.com/d2/d2graph"
"oss.terrastruct.com/d2/lib/log"
timelib "oss.terrastruct.com/d2/lib/time"
)
// execPlugin uses the binary at pathname with the plugin protocol to implement
@ -148,7 +148,7 @@ func (p *execPlugin) Info(ctx context.Context) (_ *PluginInfo, err error) {
}
func (p *execPlugin) Layout(ctx context.Context, g *d2graph.Graph) error {
ctx, cancel := log.WithTimeout(ctx, time.Minute)
ctx, cancel := timelib.WithTimeout(ctx, time.Minute)
defer cancel()
graphBytes, err := d2graph.SerializeGraph(g)

3
e2etests/report/main.go
View file

@ -16,6 +16,7 @@ import (
"time"
"oss.terrastruct.com/d2/lib/log"
timelib "oss.terrastruct.com/d2/lib/time"
)
//go:embed template.html
@ -70,7 +71,7 @@ func main() {
if !*skipTests {
ctx := log.Stderr(context.Background())
ctx, cancel := log.WithTimeout(ctx, 2*time.Minute)
ctx, cancel := timelib.WithTimeout(ctx, 2*time.Minute)
defer cancel()
// don't want to pass empty args to CommandContext

14
lib/log/log.go
View file

@ -8,7 +8,6 @@ import (
"os"
"runtime/debug"
"testing"
"time"
"cdr.dev/slog"
"cdr.dev/slog/sloggers/sloghuman"
@ -113,16 +112,3 @@ func Stderr(ctx context.Context) context.Context {
return With(ctx, l)
}
// WithTimeout returns context.WithTimeout(ctx, timeout) but timeout is overridden with D2_TIMEOUT if set
func WithTimeout(ctx context.Context, timeout time.Duration) (context.Context, context.CancelFunc) {
t := timeout
if seconds, has := env.Timeout(); has {
t = time.Duration(seconds) * time.Second
}
if t <= 0 {
return ctx, func() {}
}
return context.WithTimeout(ctx, t)
}

26
lib/time/time.go Normal file
View file

@ -0,0 +1,26 @@
package time
import (
"context"
"time"
"oss.terrastruct.com/d2/lib/env"
)
func HumanDate(t time.Time) string {
local := t.Local()
return local.Format(time.RFC822)
}
// WithTimeout returns context.WithTimeout(ctx, timeout) but timeout is overridden with D2_TIMEOUT if set
func WithTimeout(ctx context.Context, timeout time.Duration) (context.Context, context.CancelFunc) {
t := timeout
if seconds, has := env.Timeout(); has {
t = time.Duration(seconds) * time.Second
}
if t <= 0 {
return ctx, func() {}
}
return context.WithTimeout(ctx, t)
}