mirrors/diun
1
0
Fork 0
mirror of https://github.com/crazy-max/diun.git synced 2025-12-25 14:59:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move syscall to golang.org/x/sys (#525)

Browse Source 
Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax
2021-12-26 03:59:19 +01:00
committed by GitHub
parent 82d056d3ab
commit 848a9a08ac
7 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/serve.go
View File

@@ -4,11 +4,11 @@ import (
"os"
"os/signal"
"path"
"syscall"
"github.com/crazy-max/diun/v4/internal/app"
"github.com/crazy-max/diun/v4/internal/config"
"github.com/crazy-max/diun/v4/internal/logging"
"github.com/crazy-max/diun/v4/pkg/utl"
"github.com/pkg/profile"
"github.com/rs/zerolog/log"
)
@@ -39,7 +39,7 @@ func (s *ServeCmd) Run(ctx *Context) error {
// Handle os signals
channel := make(chan os.Signal)
signal.Notify(channel, os.Interrupt, syscall.SIGTERM)
signal.Notify(channel, os.Interrupt, utl.SIGTERM)
go func() {
sig := <-channel
diun.Close()

2
go.mod
View File

@@ -39,6 +39,7 @@ require (
github.com/stretchr/testify v1.7.0
github.com/tidwall/pretty v1.2.0
go.etcd.io/bbolt v1.3.6
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
google.golang.org/grpc v1.42.0
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0
google.golang.org/protobuf v1.27.1
@@ -119,7 +120,6 @@ require (
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0 // indirect
golang.org/x/term v0.0.0-20210503060354-a79de5458b56 // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect

3
go.sum
View File

@@ -1551,8 +1551,9 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0 h1:xrCZDmdtoloIiooiA9q0OQb9r8HejIHYoHGhGCe1pGg=
golang.org/x/sys v0.0.0-20210910150752-751e447fb3d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

1
internal/notif/script/cmd.go
View File

@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows
package script

8
internal/notif/script/cmd_windows.go
View File

@@ -1,10 +1,14 @@
//go:build windows
// +build windows
package script
import (
"os/exec"
"syscall"
"golang.org/x/sys/windows"
)
func setSysProcAttr(cmd *exec.Cmd) {
cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
cmd.SysProcAttr = &windows.SysProcAttr{HideWindow: true}
}

12
pkg/utl/sig.go Normal file
View File

@@ -0,0 +1,12 @@
//go:build !windows
// +build !windows
package utl
import (
"golang.org/x/sys/unix"
)
const (
SIGTERM = unix.SIGTERM
)

12
pkg/utl/sig_windows.go Normal file
View File

@@ -0,0 +1,12 @@
//go:build windows
// +build windows
package utl
import (
"golang.org/x/sys/windows"
)
const (
SIGTERM = windows.SIGTERM
)