go/gops
go/gops
1
0
Fork 0
mirror of https://github.com/google/gops.git synced 2024-11-19 20:31:58 +02:00
Code Issues Releases Activity

agent: move check for EROFS/EPERM outside of saveConfig

Browse Source 
Rather than duplicating the check in saveConfig, check for EROFS or
EPERM on the error returned by saveConfig.
This commit is contained in:
Tobias Klauser 2023-10-05 21:41:56 +02:00 committed by Tobias Klauser
parent 6b856f0f17
commit 582fc2828e
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
agent/agent.go
View File

@ -102,7 +102,10 @@ func Listen(opts Options) error {
port := listener.Addr().(*net.TCPAddr).Port
err = saveConfig(opts, port)
if err != nil {
return err
// ignore and work in remote mode only
if !errors.Is(err, syscall.EROFS) && !errors.Is(err, syscall.EPERM) {
return err
}
}
if opts.ShutdownCleanup {
@ -149,23 +152,12 @@ func saveConfig(opts Options, port int) error {
}
err := os.MkdirAll(gopsdir, os.ModePerm)
if errors.Is(err, syscall.EROFS) || errors.Is(err, syscall.EPERM) { // ignore and work in remote mode only
return nil
}
if err != nil {
return err
}
portfile = filepath.Join(gopsdir, strconv.Itoa(os.Getpid()))
err = os.WriteFile(portfile, []byte(strconv.Itoa(port)), os.ModePerm)
if errors.Is(err, syscall.EROFS) || errors.Is(err, syscall.EPERM) { // ignore and work in remote mode only
return nil
}
if err != nil {
return err
}
return nil
return os.WriteFile(portfile, []byte(strconv.Itoa(port)), os.ModePerm)
}
func gracefulShutdown() {