Add support for data_usage event

This commit is contained in:
Arturo Filastò
2018-09-12 13:42:16 +02:00
parent 2081c25b73
commit 54af7170d4
6 changed files with 40 additions and 16 deletions
+2 -2
View File
@@ -29,8 +29,8 @@ func init() {
msmtSummary := output.MeasurementSummaryData{
TotalCount: 0,
AnomalyCount: 0,
DataUsageUp: 0,
DataUsageDown: 0,
DataUsageUp: 0.0,
DataUsageDown: 0.0,
TotalRuntime: 0,
}
for _, msmt := range measurements {
+2 -2
View File
@@ -91,8 +91,8 @@ type Result struct {
Runtime float64 `db:"runtime"` // Runtime is expressed in fractional seconds
IsViewed bool `db:"is_viewed"`
IsDone bool `db:"is_done"`
DataUsageUp int64 `db:"data_usage_up"`
DataUsageDown int64 `db:"data_usage_down"`
DataUsageUp float64 `db:"data_usage_up"`
DataUsageDown float64 `db:"data_usage_down"`
MeasurementDir string `db:"measurement_dir"`
}
+3 -3
View File
@@ -113,8 +113,8 @@ func logResultSummary(w io.Writer, f log.Fields) error {
networks := f.Get("total_networks").(int64)
tests := f.Get("total_tests").(int64)
dataUp := f.Get("total_data_usage_up").(int64)
dataDown := f.Get("total_data_usage_down").(int64)
dataUp := f.Get("total_data_usage_up").(float64)
dataDown := f.Get("total_data_usage_down").(float64)
if tests == 0 {
fmt.Fprintf(w, "No results\n")
fmt.Fprintf(w, "Try running:\n")
@@ -125,7 +125,7 @@ func logResultSummary(w io.Writer, f log.Fields) error {
fmt.Fprintf(w, " │ %s │ %s │ %s │\n",
util.RightPad(fmt.Sprintf("%d tests", tests), 12),
util.RightPad(fmt.Sprintf("%d nets", networks), 12),
util.RightPad(fmt.Sprintf("%d ⬆ %d ⬇", dataUp, dataDown), 12))
util.RightPad(fmt.Sprintf("%.0f ⬆ %.0f ⬇", dataUp, dataDown), 12))
fmt.Fprintf(w, " └──────────────┴──────────────┴──────────────┘\n")
return nil
+6 -6
View File
@@ -24,8 +24,8 @@ type MeasurementSummaryData struct {
TotalRuntime float64
TotalCount int64
AnomalyCount int64
DataUsageUp int64
DataUsageDown int64
DataUsageUp float64
DataUsageDown float64
}
func MeasurementSummary(msmt MeasurementSummaryData) {
@@ -79,8 +79,8 @@ type ResultItemData struct {
NetworkName string
ASN uint
Done bool
DataUsageDown int64
DataUsageUp int64
DataUsageDown float64
DataUsageUp float64
Index int
TotalCount int
}
@@ -109,8 +109,8 @@ func ResultItem(result ResultItemData) {
type ResultSummaryData struct {
TotalTests int64
TotalDataUsageUp int64
TotalDataUsageDown int64
TotalDataUsageUp float64
TotalDataUsageDown float64
TotalNetworks int64
}