opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-26 00:43:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Review tsdb protobuf contract

Browse Source
This commit is contained in:
bergquist
2018-01-11 15:01:49 +01:00
parent 1fd40a48d9
commit ce4beb730d
5 changed files with 127 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/tsdb/time_range.go
View File

@ -11,14 +11,14 @@ func NewTimeRange(from, to string) *TimeRange {
return &TimeRange{
From: from,
To: to,
Now: time.Now(),
now: time.Now(),
}
}
type TimeRange struct {
From string
To string
Now time.Time
now time.Time
}
func (tr *TimeRange) GetFromAsMsEpoch() int64 {
@ -65,12 +65,12 @@ func (tr *TimeRange) ParseFrom() (time.Time, error) {
return time.Time{}, err
}
return tr.Now.Add(diff), nil
return tr.now.Add(diff), nil
}
func (tr *TimeRange) ParseTo() (time.Time, error) {
if tr.To == "now" {
return tr.Now, nil
return tr.now, nil
} else if strings.HasPrefix(tr.To, "now-") {
withoutNow := strings.Replace(tr.To, "now-", "", 1)
@ -79,7 +79,7 @@ func (tr *TimeRange) ParseTo() (time.Time, error) {
return time.Time{}, nil
}
return tr.Now.Add(diff), nil
return tr.now.Add(diff), nil
}
if res, ok := tryParseUnixMsEpoch(tr.To); ok {