Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

fix in health endpoint (error handling) and scenario duplication

Browse source
This commit is contained in:
Sonja Happ 2021-10-19 11:17:31 +02:00
parent e7679a79b7
commit d6ab81a0f9
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
routes/healthz/healthz_endpoint.go
View file

@ -22,6 +22,7 @@
package healthz package healthz
import ( import (
"fmt"
"log" "log"
"net/http" "net/http"
"strings" "strings"
@ -74,6 +75,7 @@ func getHealth(c *gin.Context) {
} }
if len(url) != 0 { if len(url) != 0 {
if session != nil {
err = session.CheckConnection() err = session.CheckConnection()
if err != nil { if err != nil {
log.Println(err.Error()) log.Println(err.Error())
@ -83,6 +85,14 @@ func getHealth(c *gin.Context) {
}) })
return return
} }
} else {
c.JSON(http.StatusInternalServerError, gin.H{
"success:": false,
"message": fmt.Errorf("AMQP session is nil"),
})
return
}
} }
// Send a 204 reponse // Send a 204 reponse

2
routes/user/scenario_duplication.go
View file

@ -57,7 +57,7 @@ func duplicateScenarioForUser(s database.Scenario, user *database.User) <-chan e
err = db.Find(&ic, icID).Error err = db.Find(&ic, icID).Error
if err != nil { if err != nil {
errs <- fmt.Errorf("Cannot find IC with id %d in DB, will not duplicate for User %s: %s", icID, user.Username, err) log.Printf("Cannot find IC with id %d in DB, will not duplicate for User %s: %s", icID, user.Username, err)
continue continue
} }