Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

enhancement: health check should ping database (#680)

Guilherme Oenning2e98038befd3
diff --git a/app/handlers/apiv1/invite.go b/app/handlers/apiv1/invite.go
index cfa0af93a..72c4fb495 100644
--- a/app/handlers/apiv1/invite.go
+++ b/app/handlers/apiv1/invite.go
@@ -6,6 +6,7 @@ import (
"github.com/getfider/fider/app"
"github.com/getfider/fider/app/actions"
"github.com/getfider/fider/app/pkg/email"
+ "github.com/getfider/fider/app/pkg/log"
"github.com/getfider/fider/app/pkg/markdown"
"github.com/getfider/fider/app/pkg/web"
"github.com/getfider/fider/app/tasks"
@@ -43,6 +44,10 @@ func SendInvites() web.HandlerFunc {
return c.HandleValidation(result)
}
+ c.Logger().Warnf("Sending @{TotalInvites:magenta} invites by @{ClientIP:magenta}", log.Props{
+ "TotalInvites": len(input.Invitations),
+ "ClientIP": c.Request.ClientIP,
+ })
c.Enqueue(tasks.SendInvites(input.Model.Subject, input.Model.Message, input.Invitations))
return c.Ok(web.Map{})
diff --git a/app/handlers/common.go b/app/handlers/common.go
index fb18fe307..ff472116e 100644
--- a/app/handlers/common.go
+++ b/app/handlers/common.go
@@ -18,6 +18,10 @@ import (
//Health always returns OK
func Health() web.HandlerFunc {
return func(c web.Context) error {
+ err := c.Engine().Database().Ping()
+ if err != nil {
+ return c.Failure(err)
+ }
return c.Ok(web.Map{})
}
}
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.go
index 0b2946acd..912949562 100644
--- a/app/pkg/dbx/dbx.go
+++ b/app/pkg/dbx/dbx.go
@@ -58,6 +58,12 @@ func (db *Database) Connection() *sql.DB {
return db.conn
}
+// Ping checks if current database connection is healthy
+func (db *Database) Ping() error {
+ _, err := db.conn.Exec("SELECT 1")
+ return err
+}
+
// SetLogger replaces current database Logger
func (db *Database) SetLogger(logger log.Logger) {
db.logger = logger