Skip to content

Commit

Permalink
minor: move some code to saveConfig() to make it more readable
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Lyashko <[email protected]>
  • Loading branch information
xaurx authored and tklauser committed Oct 5, 2023
1 parent f80c100 commit cf6d865
Showing 1 changed file with 26 additions and 17 deletions.
43 changes: 26 additions & 17 deletions agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,9 @@ func Listen(opts Options) (err error) {
if err != nil {
return err
}
port := listener.Addr().(*net.TCPAddr).Port

gopsdir := opts.ConfigDir
if gopsdir == "" {
cfgDir, err := internal.ConfigDir()
if err != nil {
return err
}
gopsdir = cfgDir
}

err = os.MkdirAll(gopsdir, os.ModePerm)
if err != nil {
return err
}

portfile = filepath.Join(gopsdir, strconv.Itoa(os.Getpid()))
err = os.WriteFile(portfile, []byte(strconv.Itoa(port)), os.ModePerm)
port := listener.Addr().(*net.TCPAddr).Port
err = saveConfig(opts, port)
if err != nil {
return err
}
Expand Down Expand Up @@ -149,6 +134,30 @@ func listen(l net.Listener) {
}
}

func saveConfig(opts Options, port int) (err error) {
gopsdir := opts.ConfigDir
if gopsdir == "" {
cfgDir, err := internal.ConfigDir()
if err != nil {
return err
}
gopsdir = cfgDir
}

err = os.MkdirAll(gopsdir, os.ModePerm)
if err != nil {
return err
}

portfile = filepath.Join(gopsdir, strconv.Itoa(os.Getpid()))
err = os.WriteFile(portfile, []byte(strconv.Itoa(port)), os.ModePerm)
if err != nil {
return err
}

return nil
}

func gracefulShutdown() {
c := make(chan os.Signal, 1)
gosignal.Notify(c, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT)
Expand Down

0 comments on commit cf6d865

Please sign in to comment.