lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2025-06-11 18:40:40 +00:00
Code Issues Releases Activity

Merge branch 'develop' of github.com:beego/bee into develop

Browse Source 
# Conflicts:
#	cmd/commands/dlv/dlv_amd64.go
#	go.mod
#	go.sum
This commit is contained in:
Waleed Gadelkareem
2020-06-20 11:58:52 +02:00
parent f5cc7abe8d 8ebb7977f9
commit ad695cd8c6
4 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/commands/dlv/dlv_amd64.go
View File

@ -29,6 +29,7 @@ import (
beeLogger "github.com/beego/bee/logger"
"github.com/beego/bee/utils"
"github.com/gadelkareem/delve/service"
"github.com/gadelkareem/delve/service/debugger"
"github.com/gadelkareem/delve/service/rpc2"
"github.com/gadelkareem/delve/service/rpccommon"
"github.com/gadelkareem/delve/pkg/terminal"
@ -150,6 +151,11 @@ func startDelveDebugger(addr string, ch chan int) int {
AcceptMulti: true,
APIVersion: 2,
ProcessArgs: []string{abs},
Debugger: debugger.Config{
AttachPid: 0,
WorkingDir: ".",
Backend: "default",
},
})
if err := server.Run(); err != nil {
beeLogger.Log.Fatalf("Could not start debugger server: %v", err)

2
cmd/commands/version/version.go
View File

@ -57,7 +57,7 @@ Prints the current Bee, Beego and Go version alongside the platform information.
}
var outputFormat string
const version = "1.10.0"
const version = "1.11.0"
func init() {
fs := flag.NewFlagSet("version", flag.ContinueOnError)