github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

updated names

pull/1097/head
Rhythm 2022-02-25 18:56:01 +05:30
parent aa32a6c5e3
commit 7f0d3a94a8
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handlers/downtimes.go
View File

@ -93,7 +93,7 @@ func apiAllDowntimesForServiceHandler(w http.ResponseWriter, r *http.Request) {
serviceId := utils.ToInt(vars["service_id"]) serviceId := utils.ToInt(vars["service_id"])
ninetyDaysAgo := time.Now().Add(time.Duration(-90*24) * time.Hour) ninetyDaysAgo := time.Now().Add(time.Duration(-90*24) * time.Hour)
downtime, err := downtimes.FindByService(serviceId, ninetyDaysAgo, time.Now()) downtime, err := downtimes.FindByServiceAndDuration(serviceId, ninetyDaysAgo, time.Now())
if err != nil { if err != nil {
sendErrorJson(err, w, r) sendErrorJson(err, w, r)
return return

7
handlers/services.go
View File

@ -545,11 +545,12 @@ func apiAllServicesStatusHandler(w http.ResponseWriter, r *http.Request) {
t = query.Get("time") t = query.Get("time")
} }
var srvs []services.ServiceWithDowntime var srvs []services.ServiceWithDowntime
servicesList := services.AllInOrder()
m := make(map[int64]downtimes.Downtime) m := make(map[int64]downtimes.Downtime)
if t == "" { if t == "" {
for _, v := range services.AllInOrder() { for _, v := range servicesList {
if v.Online == false { if v.Online == false {
downtime := downtimes.FindDowntime2(v.Id) downtime := downtimes.FindLatestDowntimeOfService(v.Id)
m[v.Id] = downtime m[v.Id] = downtime
} }
} }
@ -560,7 +561,7 @@ func apiAllServicesStatusHandler(w http.ResponseWriter, r *http.Request) {
} }
} }
for _, v := range services.AllInOrder() { for _, v := range servicesList {
var serviceDowntimeVar services.ServiceWithDowntime var serviceDowntimeVar services.ServiceWithDowntime
serviceDowntimeVar.Service = v serviceDowntimeVar.Service = v
if vv, ok := m[v.Id]; ok == true { if vv, ok := m[v.Id]; ok == true {

4
types/downtimes/database.go
View File

@ -53,7 +53,7 @@ func (c *Downtime) BeforeUpdate() error {
return c.Validate() return c.Validate()
} }
func FindByService(service int64, start time.Time, end time.Time) (*[]Downtime, error) { func FindByServiceAndDuration(service int64, start time.Time, end time.Time) (*[]Downtime, error) {
var downtime []Downtime var downtime []Downtime
q := db.Where("service = ? and start BETWEEN ? AND ? ", service, start, end) q := db.Where("service = ? and start BETWEEN ? AND ? ", service, start, end)
q = q.Order("id ASC ").Find(&downtime) q = q.Order("id ASC ").Find(&downtime)
@ -67,7 +67,7 @@ func FindDowntime(timeVar time.Time) []Downtime {
return downtime return downtime
} }
func FindDowntime2(service int64) Downtime { func FindLatestDowntimeOfService(service int64) Downtime {
var downtime Downtime var downtime Downtime
q := db.Where("service = ?", service) q := db.Where("service = ?", service)
q = q.Order("start desc").First(&downtime) q = q.Order("start desc").First(&downtime)