Fixed dep ensure, added all dependencies, increasing the timer no activity counter

Author: selvakn

Gopkg.lock

@@ -21,6 +21,22 @@
 #  version = "2.4.0"
 
 
+[[constraint]]
+  branch = "master"
+  name = "github.com/c2h5oh/datasize"
+
 [[constraint]]
   branch = "master"
   name = "github.com/google/logger"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/gosuri/uilive"
+
+[[constraint]]
+  name = "github.com/paulbellamy/ratecounter"
+  version = "0.2.0"
+
+[[constraint]]
+  name = "gopkg.in/alecthomas/kingpin.v2"
+  version = "2.2.5"

Gopkg.toml

@@ -36,6 +36,7 @@ var (
 func main() {
 	logger.Init("p2p-port-forward", false, false, os.Stdout)
 
+	kingpin.Version("1.0.1")
 	kingpin.Parse()
 
 	zt := libzt.Init(*network, "./zt")

main.go

@@ -6,14 +6,16 @@ import (
 	"time"
 )
 
+var rateUpdateInterval = 10 * time.Second
+
 type DataRateCounter interface {
 	GetDataRate() datasize.ByteSize
 	CaptureEvent(rate int)
 }
 
 func NewRateCounter() DataRateCounter {
 	counter := dataRateCounter{
-		rateCounter:     ratecounter.NewRateCounter(10 * time.Second),
+		rateCounter:     ratecounter.NewRateCounter(rateUpdateInterval),
 		noActivityTimer: time.NewTimer(time.Second),
 	}
 	go counter.updateOnNoActivity()
@@ -22,7 +24,7 @@ func NewRateCounter() DataRateCounter {
 }
 
 type dataRateCounter struct {
-	rateCounter *ratecounter.RateCounter
+	rateCounter     *ratecounter.RateCounter
 	noActivityTimer *time.Timer
 }
 
@@ -32,12 +34,13 @@ func (c dataRateCounter) GetDataRate() datasize.ByteSize {
 
 func (c dataRateCounter) CaptureEvent(rate int) {
 	c.rateCounter.Incr(int64(rate))
-	c.noActivityTimer.Reset(time.Second)
+	c.noActivityTimer.Reset(rateUpdateInterval)
 }
 
 func (c dataRateCounter) updateOnNoActivity() {
 	for {
 		<-c.noActivityTimer.C
 		c.rateCounter.Incr(0)
+		c.noActivityTimer.Reset(rateUpdateInterval)
 	}
 }