Skip to content

Commit a335bc8

Browse files
authored
Merge pull request #1 from prometheus-community/superq/update
Cleanup issues
2 parents 06ad41a + 55c5814 commit a335bc8

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

Diff for: go.mod

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module github.com/prometheus-community/go-runit
2+
3+
go 1.20

Diff for: runit/runit.go

+2-15
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package runit
33
import (
44
"errors"
55
"fmt"
6-
"io/ioutil"
76
"os"
87
"syscall"
98
"time"
@@ -55,13 +54,13 @@ func GetServices(dir string) ([]*service, error) {
5554
if dir == "" {
5655
dir = defaultServiceDir
5756
}
58-
files, err := ioutil.ReadDir(dir)
57+
files, err := os.ReadDir(dir)
5958
if err != nil {
6059
return nil, err
6160
}
6261
services := []*service{}
6362
for _, file := range files {
64-
if file.Mode()&os.ModeSymlink == os.ModeSymlink || file.IsDir() {
63+
if file.Type() == os.ModeSymlink || file.IsDir() {
6564
services = append(services, GetService(file.Name(), dir))
6665
}
6766
}
@@ -80,18 +79,6 @@ func (s *service) file(file string) string {
8079
return fmt.Sprintf("%s/%s/supervise/%s", s.ServiceDir, s.Name, file)
8180
}
8281

83-
func (s *service) runsvRunning() (bool, error) {
84-
file, err := os.OpenFile(s.file("ok"), os.O_WRONLY, 0)
85-
if err != nil {
86-
if err == syscall.ENXIO {
87-
return false, nil
88-
}
89-
return false, err
90-
}
91-
file.Close()
92-
return true, nil
93-
}
94-
9582
func (s *service) status() ([]byte, error) {
9683
file, err := os.Open(s.file("status"))
9784
if err != nil {

0 commit comments

Comments
 (0)