Skip to content

Commit

Permalink
Merge pull request #63 from tbs60/dev_tming
Browse files Browse the repository at this point in the history
Dev tming(支持controller的stderr重定向到文件)
  • Loading branch information
tming authored Apr 12, 2023
2 parents 8770f21 + 688b11e commit d9831d5
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 0 deletions.
15 changes: 15 additions & 0 deletions src/backend/booster/bk_dist/common/syscall/syscall_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -309,3 +309,18 @@ func AddPath2Env(p string) {
newpath := fmt.Sprintf("%s:%s", p, path)
os.Setenv("PATH", newpath)
}

func RedirectStderror(f string) error {
file, err := os.OpenFile(f, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
if err != nil {
fmt.Println(err)
return err
}

if err = syscall.Dup2(int(file.Fd()), int(os.Stderr.Fd())); err != nil {
fmt.Println(err)
return err
}

return nil
}
40 changes: 40 additions & 0 deletions src/backend/booster/bk_dist/common/syscall/syscall_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -453,3 +453,43 @@ func AddPath2Env(p string) {
newpath := fmt.Sprintf("%s;%s", p, path)
os.Setenv("path", newpath)
}

func SetStdHandle(stdhandle int32, handle syscall.Handle) error {
kernel32, err := syscall.LoadLibrary("kernel32.dll")
if err != nil {
fmt.Println(err)
return err
}
defer syscall.FreeLibrary(kernel32)

api, err := syscall.GetProcAddress(kernel32, "SetStdHandle")
if err != nil {
fmt.Println(err)
return err
}

r0, _, e1 := syscall.Syscall(uintptr(api), 2, uintptr(stdhandle), uintptr(handle), 0)
if r0 == 0 {
if e1 != 0 {
return error(e1)
}
return syscall.EINVAL
}
return nil
}

func RedirectStderror(f string) error {
var err error
file, err := os.OpenFile(f, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
if err != nil {
fmt.Println(err)
return err
}
err = SetStdHandle(syscall.STD_ERROR_HANDLE, syscall.Handle(file.Fd()))
if err != nil {
fmt.Println(err)
return err
}

return nil
}
5 changes: 5 additions & 0 deletions src/backend/booster/bk_dist/controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ package main
import (
"fmt"
"os"
"path/filepath"

"github.com/TencentBlueKing/bk-turbo/src/backend/booster/bk_dist/common/syscall"
"github.com/TencentBlueKing/bk-turbo/src/backend/booster/bk_dist/controller/config"
"github.com/TencentBlueKing/bk-turbo/src/backend/booster/bk_dist/controller/pkg"
"github.com/TencentBlueKing/bk-turbo/src/backend/booster/common/blog"
Expand All @@ -23,6 +25,9 @@ func main() {
c.Parse()
blog.InitLogs(c.LogConfig)

panicfile := filepath.Join(c.LogConfig.LogDir, "bk-dist-controller-panic.log")
syscall.RedirectStderror(panicfile)

if err := pkg.Run(c); err != nil {
_, _ = fmt.Fprintln(os.Stderr, err)
blog.Errorf("start controller failed: %v", err)
Expand Down

0 comments on commit d9831d5

Please sign in to comment.