feat: inc generic metric if error occurs #161
This commit is contained in:
@@ -5,7 +5,6 @@ import (
|
|||||||
"crypto/subtle"
|
"crypto/subtle"
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"log/slog"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/mail"
|
"net/mail"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -96,12 +95,12 @@ func HandleSignUpVerifyResponsePage(db *sql.DB) http.HandlerFunc {
|
|||||||
`, token)
|
`, token)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Could not update user: " + err.Error())
|
utils.LogError("Could not update user", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
i, err := result.RowsAffected()
|
i, err := result.RowsAffected()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Could not get rows affected: " + err.Error())
|
utils.LogError("Could not get rows affected", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -144,7 +143,7 @@ func HandleSignUpComp(db *sql.DB) http.HandlerFunc {
|
|||||||
|
|
||||||
userId, err := uuid.NewRandom()
|
userId, err := uuid.NewRandom()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Could not generate UUID: %v", err)
|
utils.LogError("Could not generate UUID", err)
|
||||||
auth.Error("Internal Server Error").Render(r.Context(), w)
|
auth.Error("Internal Server Error").Render(r.Context(), w)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -152,7 +151,7 @@ func HandleSignUpComp(db *sql.DB) http.HandlerFunc {
|
|||||||
salt := make([]byte, 16)
|
salt := make([]byte, 16)
|
||||||
_, err = rand.Read(salt)
|
_, err = rand.Read(salt)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Could not generate salt: %v", err)
|
utils.LogError("Could not generate salt", err)
|
||||||
auth.Error("Internal Server Error").Render(r.Context(), w)
|
auth.Error("Internal Server Error").Render(r.Context(), w)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -172,7 +171,7 @@ func HandleSignUpComp(db *sql.DB) http.HandlerFunc {
|
|||||||
}
|
}
|
||||||
|
|
||||||
auth.Error("Internal Server Error").Render(r.Context(), w)
|
auth.Error("Internal Server Error").Render(r.Context(), w)
|
||||||
slog.Error("Could not insert user: %v", err)
|
utils.LogError("Could not insert user", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -250,7 +249,7 @@ func HandleSignOutComp(db *sql.DB) http.HandlerFunc {
|
|||||||
if user != nil {
|
if user != nil {
|
||||||
_, err := db.Exec("DELETE FROM session WHERE session_id = ?", user.SessionId)
|
_, err := db.Exec("DELETE FROM session WHERE session_id = ?", user.SessionId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Could not delete session: %v", err)
|
utils.LogError("Could not delete session%v", err)
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -289,14 +288,14 @@ func sendVerificationEmail(db *sql.DB, r *http.Request, userId string, email str
|
|||||||
var b []byte = make([]byte, 32)
|
var b []byte = make([]byte, 32)
|
||||||
_, err := rand.Reader.Read(b)
|
_, err := rand.Reader.Read(b)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Could not generate token: " + err.Error())
|
utils.LogError("Could not generate token", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
token := base64.StdEncoding.EncodeToString(b)
|
token := base64.StdEncoding.EncodeToString(b)
|
||||||
|
|
||||||
_, err = db.Exec("INSERT INTO user_token (user_uuid, type, token, created_at) VALUES (?, 'email_verify', ?, datetime())", userId, token)
|
_, err = db.Exec("INSERT INTO user_token (user_uuid, type, token, created_at) VALUES (?, 'email_verify', ?, datetime())", userId, token)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Could not insert token: " + err.Error())
|
utils.LogError("Could not insert token", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -310,7 +309,7 @@ func tryCreateSessionAndSetCookie(r *http.Request, w http.ResponseWriter, db *sq
|
|||||||
var session_id_bytes []byte = make([]byte, 32)
|
var session_id_bytes []byte = make([]byte, 32)
|
||||||
_, err := rand.Reader.Read(session_id_bytes)
|
_, err := rand.Reader.Read(session_id_bytes)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Could not generate session ID: " + err.Error())
|
utils.LogError("Could not generate session ID", err)
|
||||||
auth.Error("Internal Server Error").Render(r.Context(), w)
|
auth.Error("Internal Server Error").Render(r.Context(), w)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
@@ -319,12 +318,12 @@ func tryCreateSessionAndSetCookie(r *http.Request, w http.ResponseWriter, db *sq
|
|||||||
// Delete old inactive sessions
|
// Delete old inactive sessions
|
||||||
_, err = db.Exec("DELETE FROM session WHERE created_at < datetime('now','-8 hours') AND user_uuid = ?", user_uuid)
|
_, err = db.Exec("DELETE FROM session WHERE created_at < datetime('now','-8 hours') AND user_uuid = ?", user_uuid)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Could not delete old sessions: " + err.Error())
|
utils.LogError("Could not delete old sessions", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
_, err = db.Exec("INSERT INTO session (session_id, user_uuid, created_at) VALUES (?, ?, datetime())", session_id, user_uuid)
|
_, err = db.Exec("INSERT INTO session (session_id, user_uuid, created_at) VALUES (?, ?, datetime())", session_id, user_uuid)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error("Could not insert session: " + err.Error())
|
utils.LogError("Could not insert session", err)
|
||||||
auth.Error("Internal Server Error").Render(r.Context(), w)
|
auth.Error("Internal Server Error").Render(r.Context(), w)
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package service
|
package service
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"log/slog"
|
|
||||||
"me-fit/template"
|
"me-fit/template"
|
||||||
"me-fit/template/workout"
|
"me-fit/template/workout"
|
||||||
"me-fit/utils"
|
"me-fit/utils"
|
||||||
@@ -66,7 +65,7 @@ func HandleWorkoutNewComp(db *sql.DB) http.HandlerFunc {
|
|||||||
var rowId int
|
var rowId int
|
||||||
err = db.QueryRow("INSERT INTO workout (user_id, date, type, sets, reps) VALUES (?, ?, ?, ?, ?) RETURNING rowid", user.Id, date, typeStr, sets, reps).Scan(&rowId)
|
err = db.QueryRow("INSERT INTO workout (user_id, date, type, sets, reps) VALUES (?, ?, ?, ?, ?) RETURNING rowid", user.Id, date, typeStr, sets, reps).Scan(&rowId)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
slog.Error(err.Error())
|
utils.LogError("Could not insert workout", err)
|
||||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ import (
|
|||||||
"me-fit/types"
|
"me-fit/types"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
|
"github.com/prometheus/client_golang/prometheus/promauto"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ContextKey string
|
type ContextKey string
|
||||||
@@ -14,6 +17,24 @@ const (
|
|||||||
ContextKeyUser ContextKey = "user_id"
|
ContextKeyUser ContextKey = "user_id"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
errorMetric = promauto.NewCounter(
|
||||||
|
prometheus.CounterOpts{
|
||||||
|
Name: "mefit_error_total",
|
||||||
|
Help: "The total number of errors during processing",
|
||||||
|
},
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
func LogError(message string, err error) {
|
||||||
|
slog.Error(message + ": " + err.Error())
|
||||||
|
errorMetric.Inc()
|
||||||
|
}
|
||||||
|
func LogErrorMsg(message string) {
|
||||||
|
slog.Error(message)
|
||||||
|
errorMetric.Inc()
|
||||||
|
}
|
||||||
|
|
||||||
func DoRedirect(w http.ResponseWriter, r *http.Request, url string) {
|
func DoRedirect(w http.ResponseWriter, r *http.Request, url string) {
|
||||||
isHtmx := r.Header.Get("HX-Request") == "true"
|
isHtmx := r.Header.Get("HX-Request") == "true"
|
||||||
if isHtmx {
|
if isHtmx {
|
||||||
|
|||||||
Reference in New Issue
Block a user