Skip to content

Commit

Permalink
Merge pull request #50 from CapillarySoftware/move_stats_pb
Browse files Browse the repository at this point in the history
Move stats pb
  • Loading branch information
vrecan committed Aug 28, 2014
2 parents 18b1430 + 0cf439d commit 79a1c14
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 1,266 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
os:
- linux
language: go
before_install:
- sudo apt-get install libzmq3-dev
Expand Down
14 changes: 9 additions & 5 deletions Godeps
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,33 @@
"Deps": [
{
"ImportPath": "code.google.com/p/gogoprotobuf/proto",
"Rev": "559fad465cf6fb43dbed4cea5f91e06f14c819e6"
"Rev": "d228c1a206c3a756d7ec6cc3579d92d00c35a161"
},
{
"ImportPath": "code.google.com/p/goprotobuf/proto",
"Comment": "go.r60-146",
"Rev": "f5ac12b15e49095c60ae0acc6da0e28d47e2a29f"
},
{
"ImportPath": "github.com/CapillarySoftware/gostat/protoStat",
"Rev": "016c9d6d5a4dd6157c6cf27df61f8c1435636c31"
},
{
"ImportPath": "github.com/cihub/seelog",
"Comment": "go1.1-24-g83d0dca",
"Rev": "83d0dcad636b63c066856045962befa246e00c79"
"Comment": "go1.1-41-gd233b77",
"Rev": "d233b770e46b3ec2a99056fa5415f34c9c61cd8d"
},
{
"ImportPath": "github.com/dustin/go-humanize",
"Rev": "3cd90eb3d932037b141d4daff9a012e1aee7e765"
"Rev": "cb7b800be3f0238405be0e57d481740cfc4fb285"
},
{
"ImportPath": "github.com/op/go-nanomsg",
"Rev": "56d628e7c641959b9dc713a83e21dc178aee25bd"
},
{
"ImportPath": "github.com/pebbe/zmq3",
"Rev": "5828282ee2f245c309aa6f03a287f5713d4cde7b"
"Rev": "2f50dab5c895a913c250b6ab17da34f53baeab8a"
}
]
}
5 changes: 3 additions & 2 deletions nanoMsgOutput/nanoMsgOutput.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import (
"encoding/json"
"errors"
. "github.com/CapillarySoftware/goiostat/diskStat"
. "github.com/CapillarySoftware/goiostat/protoStat"
. "github.com/CapillarySoftware/goiostat/protocols"
"github.com/CapillarySoftware/goiostat/statConversion"
. "github.com/CapillarySoftware/gostat/protoStat"
log "github.com/cihub/seelog"
nano "github.com/op/go-nanomsg"
"time"
Expand Down Expand Up @@ -91,7 +92,7 @@ func (this *NanoMsgOutput) SendProtoBuffers(eStat *ExtendedIoStats) (err error)
stats *ProtoStats
)

stats, err = GetProtoStats(eStat)
stats, err = statConversion.GetProtoStats(eStat)
if nil != err {
return //return the error
}
Expand Down

0 comments on commit 79a1c14

Please sign in to comment.