PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/dlv: use the same connect code whether or not we started the server

Browse Source 
Use the same connect code path whether we started the server (with
debug/exec/test) or we didn't (i.e. the 'connect' subcommand).
This fixes a bug where the init file was ignored with the 'connect'
subcommand and hopefully prevents future divergence between the
behavior of 'connect' and the other subcommands.

Fixes #1301
This commit is contained in:
aarzilli 2018-08-13 10:00:54 +02:00 committed by Derek Parker
parent 49bfbe6d24
commit f342d2784c
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cmd/dlv/cmds/commands.go
View File

@ -441,7 +441,7 @@ func connectCmd(cmd *cobra.Command, args []string) {
fmt.Fprint(os.Stderr, "An empty address was provided. You must provide an address as the first argument.\n")
os.Exit(1)
}
os.Exit(connect(addr, conf))
os.Exit(connect(addr, conf, executingOther))
}
func splitArgs(cmd *cobra.Command, args []string) ([]string, []string) {
@ -451,10 +451,18 @@ func splitArgs(cmd *cobra.Command, args []string) ([]string, []string) {
return args, []string{}
}
func connect(addr string, conf *config.Config) int {
func connect(addr string, conf *config.Config, kind executeKind) int {
// Create and start a terminal - attach to running instance
client := rpc2.NewClient(addr)
if client.Recorded() && (kind == executingGeneratedFile || kind == executingGeneratedTest) {
// When using the rr backend remove the trace directory if we built the
// executable
if tracedir, err := client.TraceDirectory(); err == nil {
defer SafeRemoveAll(tracedir)
}
}
term := terminal.New(client, conf)
term.InitFile = InitFile
status, err := term.Run()
if err != nil {
fmt.Println(err)
@ -550,26 +558,14 @@ func execute(attachPid int, processArgs []string, conf *config.Config, coreFile
case <-disconnectChan:
}
err = server.Stop()
} else {
// Create and start a terminal
client := rpc2.NewClient(listener.Addr().String())
if client.Recorded() && (kind == executingGeneratedFile || kind == executingGeneratedTest) {
// When using the rr backend remove the trace directory if we built the
// executable
if tracedir, err := client.TraceDirectory(); err == nil {
defer SafeRemoveAll(tracedir)
}
if err != nil {
fmt.Println(err)
}
term := terminal.New(client, conf)
term.InitFile = InitFile
status, err = term.Run()
return status
}
if err != nil {
fmt.Println(err)
}
return status
return connect(listener.Addr().String(), conf, kind)
}
func optflags(args []string) []string {