bug_fix

handlers/services.go

@@ -545,11 +545,27 @@ func apiAllServicesStatusHandler(w http.ResponseWriter, r *http.Request) {
 		t = query.Get("time")
 	}
 	var srvs []services.ServiceWithDowntime
-	dtime := findAllDowntimes(t)
 	m := make(map[int64]downtimes.Downtime)
-	for i := 0; i < len(dtime); i += 1 {
+	if t == "" {
-		m[dtime[i].ServiceId] = dtime[i]
+		dtime:=downtimes.FindDowntime2()
+		timeNow := time.Now()
+		for i := 0; i < len(dtime); i++ {
+			downtimeVar := dtime[i]
+			serviceVar,_ := services.Find(downtimeVar.ServiceId)
+			checkInterval := time.Duration(serviceVar.Interval)
+			timeInstance := timeNow.Add(-time.Second * checkInterval)
+			if(timeInstance.After(*(downtimeVar.Start)) || timeInstance.Equal(*(downtimeVar.Start)) ) && (downtimeVar.End == nil || (timeInstance.Before(*(downtimeVar.End)) || timeInstance.Equal(*(downtimeVar.End))) ){
+				m[downtimeVar.ServiceId] = downtimeVar
+			}
+		}
+	}else{
+		dtime := findAllDowntimes(t)
+		for i := 0; i < len(dtime); i += 1 {
+			m[dtime[i].ServiceId] = dtime[i]
+		}
 	}
+
+
 	for _, v := range services.AllInOrder() {
 		var serviceDowntimeVar services.ServiceWithDowntime
 		serviceDowntimeVar.Service = v

types/downtimes/database.go

@@ -67,6 +67,13 @@ func FindDowntime(timeVar time.Time) []Downtime {
 	return downtime
 }
 
+func FindDowntime2()[]Downtime {
+	var downtime []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)
+	return downtime
+}
+
 func FindAll(vars map[string]string) (*[]Downtime, error) {
 	var downtime []Downtime
 	var start time.Time