configure timeout with D2_TIMEOUT
This commit is contained in:
parent
5004123b30
commit
7547d51727
4 changed files with 44 additions and 6 deletions
|
|
@ -31,6 +31,7 @@ import (
|
|||
"oss.terrastruct.com/d2/d2themes"
|
||||
"oss.terrastruct.com/d2/d2themes/d2themescatalog"
|
||||
"oss.terrastruct.com/d2/lib/background"
|
||||
"oss.terrastruct.com/d2/lib/env"
|
||||
"oss.terrastruct.com/d2/lib/imgbundler"
|
||||
ctxlog "oss.terrastruct.com/d2/lib/log"
|
||||
"oss.terrastruct.com/d2/lib/pdf"
|
||||
|
|
@ -298,8 +299,16 @@ func Run(ctx context.Context, ms *xmain.State) (err error) {
|
|||
return w.run()
|
||||
}
|
||||
|
||||
ctx, cancel := context.WithTimeout(ctx, time.Minute*2)
|
||||
defer cancel()
|
||||
timeout := time.Minute * 2
|
||||
if seconds, has := env.Timeout(); has {
|
||||
timeout = time.Duration(seconds) * time.Second
|
||||
}
|
||||
|
||||
if timeout > 0 {
|
||||
var cancel func()
|
||||
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||
defer cancel()
|
||||
}
|
||||
|
||||
_, written, err := compile(ctx, ms, plugin, renderOpts, fontFamily, *animateIntervalFlag, inputPath, outputPath, *bundleFlag, *forceAppendixFlag, pw.Page)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import (
|
|||
"oss.terrastruct.com/util-go/xmain"
|
||||
|
||||
"oss.terrastruct.com/d2/d2graph"
|
||||
"oss.terrastruct.com/d2/lib/env"
|
||||
)
|
||||
|
||||
// execPlugin uses the binary at pathname with the plugin protocol to implement
|
||||
|
|
@ -147,8 +148,15 @@ func (p *execPlugin) Info(ctx context.Context) (_ *PluginInfo, err error) {
|
|||
}
|
||||
|
||||
func (p *execPlugin) Layout(ctx context.Context, g *d2graph.Graph) error {
|
||||
ctx, cancel := context.WithTimeout(ctx, time.Minute)
|
||||
defer cancel()
|
||||
timeout := time.Minute
|
||||
if seconds, has := env.Timeout(); has {
|
||||
timeout = time.Duration(seconds) * time.Second
|
||||
}
|
||||
if timeout > 0 {
|
||||
var cancel func()
|
||||
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||
defer cancel()
|
||||
}
|
||||
|
||||
graphBytes, err := d2graph.SerializeGraph(g)
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ import (
|
|||
"text/template"
|
||||
"time"
|
||||
|
||||
"oss.terrastruct.com/d2/lib/env"
|
||||
"oss.terrastruct.com/d2/lib/log"
|
||||
)
|
||||
|
||||
|
|
@ -69,8 +70,17 @@ func main() {
|
|||
|
||||
if !*skipTests {
|
||||
ctx := log.Stderr(context.Background())
|
||||
ctx, cancel := context.WithTimeout(ctx, 2*time.Minute)
|
||||
defer cancel()
|
||||
|
||||
timeout := 2 * time.Minute
|
||||
if seconds, has := env.Timeout(); has {
|
||||
timeout = time.Duration(seconds) * time.Second
|
||||
}
|
||||
if timeout > 0 {
|
||||
var cancel func()
|
||||
ctx, cancel = context.WithTimeout(ctx, timeout)
|
||||
defer cancel()
|
||||
}
|
||||
|
||||
// don't want to pass empty args to CommandContext
|
||||
args := []string{"test", testDir, testMatchString}
|
||||
if cpuProfileStr != "" {
|
||||
|
|
|
|||
11
lib/env/env.go
vendored
11
lib/env/env.go
vendored
|
|
@ -2,6 +2,7 @@ package env
|
|||
|
||||
import (
|
||||
"os"
|
||||
"strconv"
|
||||
)
|
||||
|
||||
func Test() bool {
|
||||
|
|
@ -25,3 +26,13 @@ func DevOnly() bool {
|
|||
func SkipGraphDiffTests() bool {
|
||||
return os.Getenv("SKIP_GRAPH_DIFF_TESTS") != ""
|
||||
}
|
||||
|
||||
func Timeout() (int, bool) {
|
||||
if s := os.Getenv("D2_TIMEOUT"); s != "" {
|
||||
i, err := strconv.ParseInt(s, 10, 64)
|
||||
if err == nil {
|
||||
return int(i), true
|
||||
}
|
||||
}
|
||||
return -1, false
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue