You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/10/28 21:06:26 UTC
[03/50] incubator-trafficcontrol git commit: Fix TM2 DsStats time to
ms since epoch
Fix TM2 DsStats time to ms since epoch
Fixes Traffic Monitor 2.0 /publish/DsStats endpoint stat times to
be milliseconds since the epoch, matching Traffic Monitor 1.0.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/ba497730
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/ba497730
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/ba497730
Branch: refs/heads/master
Commit: ba4977304dfc1f0d082bb23dec14e90fe9e32728
Parents: bdf5b59
Author: Robert Butts <ro...@gmail.com>
Authored: Mon Oct 24 16:00:03 2016 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Fri Oct 28 15:04:12 2016 -0600
----------------------------------------------------------------------
.../experimental/traffic_monitor/deliveryservice/stat.go | 3 ++-
.../experimental/traffic_monitor/deliveryservicedata/stat.go | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ba497730/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go b/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
index ff94e42..f2734bb 100644
--- a/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
+++ b/traffic_monitor/experimental/traffic_monitor/deliveryservice/stat.go
@@ -484,7 +484,8 @@ func addCommonData(s *dsdata.StatsOld, c *dsdata.StatCommon, deliveryService enu
// JSON returns an object formatted as expected to be serialized to JSON and served.
func (s Stats) JSON(filter dsdata.Filter, params url.Values) dsdata.StatsOld {
- now := time.Now().Unix()
+ // TODO fix to be the time calculated, not the time requested
+ now := time.Now().UnixNano() / int64(time.Millisecond) // Traffic Monitor 1.0 API is 'ms since the epoch'
jsonObj := &dsdata.StatsOld{
CommonAPIData: srvhttp.GetCommonAPIData(params, time.Now()),
DeliveryService: map[enum.DeliveryServiceName]map[dsdata.StatName][]dsdata.StatOld{},
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/ba497730/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
----------------------------------------------------------------------
diff --git a/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go b/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
index c9eb77f..ef692c0 100644
--- a/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
+++ b/traffic_monitor/experimental/traffic_monitor/deliveryservicedata/stat.go
@@ -62,7 +62,7 @@ type StatCommonReadonly interface {
// StatMeta includes metadata about a particular stat.
type StatMeta struct {
- Time int `json:"time"`
+ Time int64 `json:"time"`
}
// StatFloat is a float stat, combined with its metadata