extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-11-24 17:35:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

daemon: provide os.Environ() in zrepl status

Browse Source 
Useful for debugging.

fixes https://github.com/zrepl/zrepl/issues/534
This commit is contained in:
Christian Schwarz 2021-11-10 18:43:08 +01:00
parent cf5e8e8f26
commit c2fbf93365
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/control.go
View File

@ -8,6 +8,7 @@ import (
"io" "io"
"net" "net"
"net/http" "net/http"
"os"
"time" "time"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -124,8 +125,9 @@ func (j *controlJob) Run(ctx context.Context) {
s := Status{ s := Status{
Jobs: jobs, Jobs: jobs,
Global: GlobalStatus{ Global: GlobalStatus{
ZFSCmds: globalZFS, ZFSCmds: globalZFS,
Envconst: envconstReport, Envconst: envconstReport,
OsEnviron: os.Environ(),
}} }}
return s, nil return s, nil
}}) }})

5
daemon/daemon.go
View File

@ -160,8 +160,9 @@ type Status struct {
} }
type GlobalStatus struct { type GlobalStatus struct {
ZFSCmds *zfscmd.Report ZFSCmds *zfscmd.Report
Envconst *envconst.Report Envconst *envconst.Report
OsEnviron []string
} }
func (s *jobs) status() map[string]*job.Status { func (s *jobs) status() map[string]*job.Status {