Skip to content

Commit 7ffb6c4

Browse files
authored
[status-cake] Fix for crashes on empty responses (#465)
* [status-cake] Fix for crashes on empty responses * revert conditions
1 parent 5ac3f66 commit 7ffb6c4

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

pkg/monitors/statuscake/statuscake-monitor.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,9 +291,13 @@ func (service *StatusCakeMonitorService) GetAll() []models.Monitor {
291291
page := 1
292292
for {
293293
res := service.fetchMonitors(page)
294-
StatusCakeMonitorData = append(StatusCakeMonitorData, res.StatusCakeData...)
295-
if page >= res.StatusCakeMetadata.PageCount {
296-
break
294+
if res != nil {
295+
StatusCakeMonitorData = append(StatusCakeMonitorData, res.StatusCakeData...)
296+
if page >= res.StatusCakeMetadata.PageCount {
297+
break
298+
}
299+
} else {
300+
return nil
297301
}
298302
page += 1
299303
}
@@ -400,7 +404,7 @@ func (service *StatusCakeMonitorService) Update(m models.Monitor) {
400404
return
401405
}
402406
if resp.StatusCode == http.StatusNoContent {
403-
log.Info("Monitor Updated: " + m.ID)
407+
log.Info("Monitor Updated: " + m.ID + m.Name)
404408
} else {
405409
bodyBytes, err := ioutil.ReadAll(resp.Body)
406410
if err != nil {
@@ -439,7 +443,7 @@ func (service *StatusCakeMonitorService) Remove(m models.Monitor) {
439443
} else {
440444
_, err = service.GetByID(m.ID)
441445
if strings.Contains(err.Error(), "Request failed") {
442-
log.Info("Monitor Deleted: " + m.ID)
446+
log.Info("Monitor Deleted: " + m.ID + m.Name)
443447
} else {
444448
log.Error(nil, fmt.Sprintf("Delete Request failed for Monitor: %s with id: %s", m.Name, m.ID))
445449
}

0 commit comments

Comments
 (0)