Skip to content

Commit

Permalink
Merge pull request #27 from etherlabsio/26-upgrade-to-go-modules
Browse files Browse the repository at this point in the history
upgrade to go mod and fix deprecated lib usage for unix
  • Loading branch information
karthikmuralidharan authored Jun 17, 2021
2 parents dd3d2fd + 5841fd4 commit 572068f
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 13 deletions.
3 changes: 0 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
language: go
go:
- "1.10"
- "1.11"
- "1.12"

before_install:
Expand All @@ -12,4 +10,3 @@ script:

after_success:
- bash <(curl -s https://codecov.io/bash)

11 changes: 6 additions & 5 deletions checkers/diskspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import (
"fmt"
"os"

"github.com/etherlabsio/healthcheck"
"golang.org/x/sys/unix"
"syscall"

"github.com/etherlabsio/healthcheck/v2"
)

type diskspace struct {
dir string
threshold uint64
statfs func(string, *unix.Statfs_t) error
statfs func(string, *syscall.Statfs_t) error
}

//Check test if the filesystem disk usage is above threshold
Expand All @@ -21,7 +22,7 @@ func (ds *diskspace) Check(ctx context.Context) error {
return fmt.Errorf("filesystem not found: %v", err)
}

fs := unix.Statfs_t{}
fs := syscall.Statfs_t{}
err := ds.statfs(ds.dir, &fs)
if err != nil {
return fmt.Errorf("error looking for %s filesystem stats: %v", ds.dir, err)
Expand All @@ -42,6 +43,6 @@ func DiskSpace(dir string, threshold uint64) healthcheck.Checker {
return &diskspace{
dir: dir,
threshold: threshold,
statfs: unix.Statfs,
statfs: syscall.Statfs,
}
}
5 changes: 2 additions & 3 deletions checkers/diskspace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ package checkers
import (
"context"
"fmt"
"syscall"
"testing"

"golang.org/x/sys/unix"
)

func Test_diskspace_Check(t *testing.T) {
Expand Down Expand Up @@ -55,7 +54,7 @@ func Test_diskspace_Check(t *testing.T) {
ds := &diskspace{
dir: tt.dir,
threshold: tt.threshold,
statfs: func(fs string, stat *unix.Statfs_t) error {
statfs: func(fs string, stat *syscall.Statfs_t) error {
stat.Bsize = 1
stat.Bfree = tt.freeBlocks
stat.Blocks = tt.totalBlocks
Expand Down
2 changes: 1 addition & 1 deletion checkers/heartbeat.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"

"github.com/etherlabsio/healthcheck"
"github.com/etherlabsio/healthcheck/v2"
)

type heartbeat struct {
Expand Down
51 changes: 51 additions & 0 deletions coverage.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
mode: atomic
github.com/etherlabsio/healthcheck/v2/checkers/diskspace.go:20.55,21.43 1 4
github.com/etherlabsio/healthcheck/v2/checkers/diskspace.go:25.2,27.16 3 4
github.com/etherlabsio/healthcheck/v2/checkers/diskspace.go:31.2,35.35 5 4
github.com/etherlabsio/healthcheck/v2/checkers/diskspace.go:38.2,38.12 1 2
github.com/etherlabsio/healthcheck/v2/checkers/diskspace.go:21.43,23.3 1 0
github.com/etherlabsio/healthcheck/v2/checkers/diskspace.go:27.16,29.3 1 0
github.com/etherlabsio/healthcheck/v2/checkers/diskspace.go:35.35,37.3 1 2
github.com/etherlabsio/healthcheck/v2/checkers/diskspace.go:42.66,48.2 1 0
github.com/etherlabsio/healthcheck/v2/checkers/heartbeat.go:17.54,18.43 1 3
github.com/etherlabsio/healthcheck/v2/checkers/heartbeat.go:21.2,21.12 1 2
github.com/etherlabsio/healthcheck/v2/checkers/heartbeat.go:18.43,20.3 1 1
github.com/etherlabsio/healthcheck/v2/checkers/heartbeat.go:26.53,28.2 1 0
github.com/etherlabsio/healthcheck/v2/checkers/heartbeat.go:30.40,31.36 1 2
github.com/etherlabsio/healthcheck/v2/checkers/heartbeat.go:35.2,35.28 1 2
github.com/etherlabsio/healthcheck/v2/checkers/heartbeat.go:38.2,38.48 1 0
github.com/etherlabsio/healthcheck/v2/checkers/heartbeat.go:41.2,41.11 1 0
github.com/etherlabsio/healthcheck/v2/checkers/heartbeat.go:31.36,34.3 2 1
github.com/etherlabsio/healthcheck/v2/checkers/heartbeat.go:35.28,37.3 1 2
github.com/etherlabsio/healthcheck/v2/checkers/heartbeat.go:38.48,40.3 1 0
github.com/etherlabsio/healthcheck/v2/health.go:34.55,36.2 1 6
github.com/etherlabsio/healthcheck/v2/health.go:39.43,45.27 2 5
github.com/etherlabsio/healthcheck/v2/health.go:48.2,48.10 1 5
github.com/etherlabsio/healthcheck/v2/health.go:45.27,47.3 1 7
github.com/etherlabsio/healthcheck/v2/health.go:52.51,54.2 1 5
github.com/etherlabsio/healthcheck/v2/health.go:60.49,61.25 1 4
github.com/etherlabsio/healthcheck/v2/health.go:61.25,63.3 1 4
github.com/etherlabsio/healthcheck/v2/health.go:67.50,68.25 1 2
github.com/etherlabsio/healthcheck/v2/health.go:68.25,70.3 1 2
github.com/etherlabsio/healthcheck/v2/health.go:74.48,75.25 1 1
github.com/etherlabsio/healthcheck/v2/health.go:75.25,77.3 1 1
github.com/etherlabsio/healthcheck/v2/health.go:80.68,86.46 4 5
github.com/etherlabsio/healthcheck/v2/health.go:87.2,87.19 1 5
github.com/etherlabsio/healthcheck/v2/health.go:90.2,96.39 5 5
github.com/etherlabsio/healthcheck/v2/health.go:107.2,107.41 1 5
github.com/etherlabsio/healthcheck/v2/health.go:118.2,125.4 4 5
github.com/etherlabsio/healthcheck/v2/health.go:86.47,86.48 0 0
github.com/etherlabsio/healthcheck/v2/health.go:87.19,89.3 1 5
github.com/etherlabsio/healthcheck/v2/health.go:96.39,97.40 1 4
github.com/etherlabsio/healthcheck/v2/health.go:97.40,98.45 1 4
github.com/etherlabsio/healthcheck/v2/health.go:104.4,104.13 1 4
github.com/etherlabsio/healthcheck/v2/health.go:98.45,103.5 4 4
github.com/etherlabsio/healthcheck/v2/health.go:107.41,108.41 1 2
github.com/etherlabsio/healthcheck/v2/health.go:108.41,109.46 1 2
github.com/etherlabsio/healthcheck/v2/health.go:114.4,114.13 1 2
github.com/etherlabsio/healthcheck/v2/health.go:109.46,113.5 3 2
github.com/etherlabsio/healthcheck/v2/health.go:132.59,134.12 2 6
github.com/etherlabsio/healthcheck/v2/health.go:137.2,137.9 1 6
github.com/etherlabsio/healthcheck/v2/health.go:134.12,136.3 1 6
github.com/etherlabsio/healthcheck/v2/health.go:138.28,139.13 1 5
github.com/etherlabsio/healthcheck/v2/health.go:140.20,141.47 1 1
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/etherlabsio/healthcheck
module github.com/etherlabsio/healthcheck/v2

go 1.12

0 comments on commit 572068f

Please sign in to comment.