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

updated logic

pull/1097/head
Rhythm 2022-02-25 09:22:36 +05:30
parent b64811a991
commit a8e8d2da06
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handlers/services.go
View File

@ -547,14 +547,11 @@ func apiAllServicesStatusHandler(w http.ResponseWriter, r *http.Request) {
var srvs []services.ServiceWithDowntime var srvs []services.ServiceWithDowntime
m := make(map[int64]downtimes.Downtime) m := make(map[int64]downtimes.Downtime)
if t == "" { if t == "" {
timeNow := time.Now()
dtime := downtimes.FindDowntime2() dtime := downtimes.FindDowntime2()
for i := 0; i < len(dtime); i++ { for i := 0; i < len(dtime); i++ {
downtimeVar := dtime[i] downtimeVar := dtime[i]
serviceVar, _ := services.Find(downtimeVar.ServiceId) serviceVar, _ := services.Find(downtimeVar.ServiceId)
checkInterval := time.Duration(serviceVar.Interval) if serviceVar.Online == false {
timeInstance := timeNow.Add(-time.Second * checkInterval)
if downtimeVar.End == nil || timeInstance.Before(*(downtimeVar.End)) || timeInstance.Equal(*(downtimeVar.End)) {
m[downtimeVar.ServiceId] = downtimeVar m[downtimeVar.ServiceId] = downtimeVar
} }
} }
@ -565,7 +562,6 @@ func apiAllServicesStatusHandler(w http.ResponseWriter, r *http.Request) {
} }
} }
for _, v := range services.AllInOrder() { for _, v := range services.AllInOrder() {
var serviceDowntimeVar services.ServiceWithDowntime var serviceDowntimeVar services.ServiceWithDowntime
serviceDowntimeVar.Service = v serviceDowntimeVar.Service = v