Commit4ce1448

authored

fix(cli): generate correctly named file in DumpHandler (#12409)

1 parentafcea74 commit4ce1448Copy full SHA for 4ce1448

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ func (r RootCmd) workspaceAgent() clibase.Cmd {`
`149`	`149`
`150`	`150`	`// DumpHandler does signal handling, so we call it after the`
`151`	`151`	`// reaper.`
`152`		`-goDumpHandler(ctx)`
	`152`	`+goDumpHandler(ctx,"agent")`
`153`	`153`
`154`	`154`	`logWriter:=&lumberjackWriteCloseFixer{w:&lumberjack.Logger{`
`155`	`155`	`Filename:filepath.Join(logDir,"coder-agent.log"),`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -937,7 +937,7 @@ func (r RootCmd) Verbosef(inv clibase.Invocation, fmtStr string, args ...inter`
`937`	`937`	`// A SIGQUIT handler will not be registered if GOTRACEBACK=crash.`
`938`	`938`	`//`
`939`	`939`	`// On Windows this immediately returns.`
`940`		`-funcDumpHandler(ctx context.Context) {`
	`940`	`+funcDumpHandler(ctx context.Context,namestring) {`
`941`	`941`	`ifruntime.GOOS=="windows" {`
`942`	`942`	`// free up the goroutine since it'll be permanently blocked anyways`
`943`	`943`	`return`
`@@ -992,7 +992,11 @@ func DumpHandler(ctx context.Context) {`
`992`	`992`	`iferr!=nil {`
`993`	`993`	`dir=os.TempDir()`
`994`	`994`	`}`
`995`		`-fpath:=filepath.Join(dir,fmt.Sprintf("coder-agent-%s.dump",time.Now().Format("2006-01-02T15:04:05.000Z")))`
	`995`	`+// Make the time filesystem-safe, for example ":" is not`
	`996`	`+// permitted on many filesystems. Note that Z here only appends`
	`997`	`+// Z to the string, it does not actually change the time zone.`
	`998`	`+filesystemSafeTime:=time.Now().UTC().Format("2006-01-02T15-04-05.000Z")`
	`999`	`+fpath:=filepath.Join(dir,fmt.Sprintf("coder-%s-%s.dump",name,filesystemSafeTime))`
`996`	`1000`	`_,_=fmt.Fprintf(os.Stderr,"writing dump to %q\n",fpath)`
`997`	`1001`
`998`	`1002`	`f,err:=os.Create(fpath)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ func (r RootCmd) Server(newAPI func(context.Context, coderd.Options) (*coderd.`
`289`	`289`	`cliui.Warnf(inv.Stderr,"YAML support is experimental and offers no compatibility guarantees.")`
`290`	`290`	`}`
`291`	`291`
`292`		`-goDumpHandler(ctx)`
	`292`	`+goDumpHandler(ctx,"coderd")`
`293`	`293`
`294`	`294`	`// Validate bind addresses.`
`295`	`295`	`ifvals.Address.String()!="" {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ func (r RootCmd) proxyServer() clibase.Cmd {`
`119`	`119`	`defertopCancel()`
`120`	`120`	`closers.Add(topCancel)`
`121`	`121`
`122`		`-gocli.DumpHandler(ctx)`
	`122`	`+gocli.DumpHandler(ctx,"workspace-proxy")`
`123`	`123`
`124`	`124`	`cli.PrintLogo(inv,"Coder Workspace Proxy")`
`125`	`125`	`logger,logCloser,err:=clilog.New(clilog.FromDeploymentValues(cfg)).Build(inv)`

Comments

(0)