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

changed studd

pull/1097/head
Rhythm 2022-02-25 13:14:53 +05:30
parent bfca2113cc
commit a21b72b154
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
handlers/services.go
View File

@ -548,14 +548,14 @@ func apiAllServicesStatusHandler(w http.ResponseWriter, r *http.Request) {
m := make(map[int64]downtimes.Downtime) m := make(map[int64]downtimes.Downtime)
if t == "" { if t == "" {
dtime := downtimes.FindDowntime2() dtime := downtimes.FindDowntime2()
log.Println(len(dtime)) log.Println("FindDowntime2 results")
log.Println(dtime) log.Println(dtime)
for i := 0; i < len(dtime); i+=1 { /*for i := 0; i < len(dtime); i+=1 {
downtimeVar := dtime[i] downtimeVar := dtime[i]
/*serviceVar, _ := services.Find(downtimeVar.ServiceId) serviceVar, _ := services.Find(downtimeVar.ServiceId)
*/
m[downtimeVar.ServiceId] = downtimeVar m[downtimeVar.ServiceId] = downtimeVar
} }*/
} else { } else {
dtime := findAllDowntimes(t) dtime := findAllDowntimes(t)
for i := 0; i < len(dtime); i += 1 { for i := 0; i < len(dtime); i += 1 {

4
types/downtimes/database.go
View File

@ -67,8 +67,8 @@ func FindDowntime(timeVar time.Time) []Downtime {
return downtime return downtime
} }
func FindDowntime2() []Downtime { func FindDowntime2() interface{} {
var downtime []Downtime var downtime interface{}
db.Raw("SELECT DISTINCT ON (downtimes.service) downtimes.* FROM downtimes ORDER BY service ASC, start DESC;").Scan(&downtime) db.Raw("SELECT DISTINCT ON (downtimes.service) downtimes.* FROM downtimes ORDER BY service ASC, start DESC;").Scan(&downtime)
//db.Select("downtimes.*").Joins("left join downtimes as d2 on d2.service = downtimes.service AND downtimes.start < d2.start").Where("d2.end = ?",nil).Find(&downtime) //db.Select("downtimes.*").Joins("left join downtimes as d2 on d2.service = downtimes.service AND downtimes.start < d2.start").Where("d2.end = ?",nil).Find(&downtime)
return downtime return downtime