Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go fmt fixes #89

Merged
merged 2 commits into from
Aug 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ test:
pre:
# Vet go code for any potential errors
- go vet ./...
# Verify that all files are properly go formatted
- "[ `git ls-files | grep '.go$' | xargs gofmt -l 2>&1 | wc -l` -eq 0 ]"
override:
# Enforce that testutil, cmd, and main directory are fully linted
- golint .
Expand Down
1 change: 1 addition & 0 deletions cmd/telegraf/telegraf.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ var fPidfile = flag.String("pidfile", "", "file to write our pid to")

// Telegraf version
var Version = "unreleased"

// Telegraf commit
var Commit = ""

Expand Down
6 changes: 3 additions & 3 deletions plugins/mysql/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ var mappings = []*mapping{
inExport: "innodb_",
},
{
onServer: "Tokudb_",
inExport: "tokudb_",
},
onServer: "Tokudb_",
inExport: "tokudb_",
},
{
onServer: "Threads_",
inExport: "threads_",
Expand Down
9 changes: 4 additions & 5 deletions plugins/prometheus/prometheus_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/stretchr/testify/require"
)


const sampleTextFormat = `# HELP go_gc_duration_seconds A summary of the GC invocation durations.
# TYPE go_gc_duration_seconds summary
go_gc_duration_seconds{quantile="0"} 0.00010425500000000001
Expand All @@ -27,9 +26,9 @@ go_goroutines 15
`

func TestPrometheusGeneratesMetrics(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Fprintln(w, sampleTextFormat)
}))
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
fmt.Fprintln(w, sampleTextFormat)
}))
defer ts.Close()

p := &Prometheus{
Expand All @@ -44,7 +43,7 @@ func TestPrometheusGeneratesMetrics(t *testing.T) {
expected := []struct {
name string
value float64
tags map[string]string
tags map[string]string
}{
{"go_gc_duration_seconds_count", 7, map[string]string{}},
{"go_goroutines", 15, map[string]string{}},
Expand Down
3 changes: 1 addition & 2 deletions plugins/system/ps/common/common_freebsd.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
package common

import (
"syscall"
"os/exec"
"strings"
"syscall"
"unsafe"
)

Expand Down Expand Up @@ -58,4 +58,3 @@ func CallSyscall(mib []int32) ([]byte, uint64, error) {

return buf, length, nil
}

50 changes: 25 additions & 25 deletions plugins/system/ps/host/host_linux_386.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,39 @@
package host

const (
sizeofPtr = 0x4
sizeofShort = 0x2
sizeofInt = 0x4
sizeofLong = 0x4
sizeofLongLong = 0x8
sizeofPtr = 0x4
sizeofShort = 0x2
sizeofInt = 0x4
sizeofLong = 0x4
sizeofLongLong = 0x8
)

type (
_C_short int16
_C_int int32
_C_long int32
_C_long_long int64
_C_short int16
_C_int int32
_C_long int32
_C_long_long int64
)

type utmp struct {
Type int16
Pad_cgo_0 [2]byte
Pid int32
Line [32]int8
Id [4]int8
User [32]int8
Host [256]int8
Exit exit_status
Session int32
Tv UtTv
Addr_v6 [4]int32
X__unused [20]int8
Type int16
Pad_cgo_0 [2]byte
Pid int32
Line [32]int8
Id [4]int8
User [32]int8
Host [256]int8
Exit exit_status
Session int32
Tv UtTv
Addr_v6 [4]int32
X__unused [20]int8
}
type exit_status struct {
Termination int16
Exit int16
Termination int16
Exit int16
}
type UtTv struct {
TvSec int32
TvUsec int32
TvSec int32
TvUsec int32
}
4 changes: 2 additions & 2 deletions plugins/system/system_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ func TestSystemStats_GenerateStats(t *testing.T) {
require.NoError(t, err)

dockertags := map[string]string{
"name": "blah",
"id": "",
"name": "blah",
"id": "",
"command": "",
}

Expand Down