mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-12-29 10:36:31 +00:00
fc3741365c
* Add Swagger spec test script * Fix Swagger spec errors not related to statuses with polls * Add API tests that post a status with a poll * Fix creating a status with a poll from form params * Fix Swagger spec errors related to statuses with polls (this is the last error) * Fix Swagger spec warnings not related to unused definitions * Suppress a duplicate list update params definition that was somehow causing wrong param names * Add Swagger test to CI - updates Drone config - vendorizes go-swagger - fixes a file extension issue that caused the test script to generate JSON instead of YAML with the vendorized version * Put `Sample: ` on its own line everywhere * Remove unused id param from emojiCategoriesGet * Add 5 more pairs of profile fields to account update API Swagger * Remove Swagger prefix from dummy fields It makes the generated code look weird * Manually annotate params for statusCreate operation * Fix all remaining Swagger spec warnings - Change some models into operation parameters - Ignore models that already correspond to manually documented operation parameters but can't be trivially changed (those with file fields) * Documented that creating a status with scheduled_at isn't implemented yet * sign drone.yml * Fix filter API Swagger errors * fixup! Fix filter API Swagger errors --------- Co-authored-by: tobi <tobi.smethurst@protonmail.com>
97 lines
2.2 KiB
Go
97 lines
2.2 KiB
Go
package handlers
|
|
|
|
import (
|
|
"log"
|
|
"net/http"
|
|
"runtime/debug"
|
|
)
|
|
|
|
// RecoveryHandlerLogger is an interface used by the recovering handler to print logs.
|
|
type RecoveryHandlerLogger interface {
|
|
Println(...interface{})
|
|
}
|
|
|
|
type recoveryHandler struct {
|
|
handler http.Handler
|
|
logger RecoveryHandlerLogger
|
|
printStack bool
|
|
}
|
|
|
|
// RecoveryOption provides a functional approach to define
|
|
// configuration for a handler; such as setting the logging
|
|
// whether or not to print stack traces on panic.
|
|
type RecoveryOption func(http.Handler)
|
|
|
|
func parseRecoveryOptions(h http.Handler, opts ...RecoveryOption) http.Handler {
|
|
for _, option := range opts {
|
|
option(h)
|
|
}
|
|
|
|
return h
|
|
}
|
|
|
|
// RecoveryHandler is HTTP middleware that recovers from a panic,
|
|
// logs the panic, writes http.StatusInternalServerError, and
|
|
// continues to the next handler.
|
|
//
|
|
// Example:
|
|
//
|
|
// r := mux.NewRouter()
|
|
// r.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
|
// panic("Unexpected error!")
|
|
// })
|
|
//
|
|
// http.ListenAndServe(":1123", handlers.RecoveryHandler()(r))
|
|
func RecoveryHandler(opts ...RecoveryOption) func(h http.Handler) http.Handler {
|
|
return func(h http.Handler) http.Handler {
|
|
r := &recoveryHandler{handler: h}
|
|
return parseRecoveryOptions(r, opts...)
|
|
}
|
|
}
|
|
|
|
// RecoveryLogger is a functional option to override
|
|
// the default logger
|
|
func RecoveryLogger(logger RecoveryHandlerLogger) RecoveryOption {
|
|
return func(h http.Handler) {
|
|
r := h.(*recoveryHandler)
|
|
r.logger = logger
|
|
}
|
|
}
|
|
|
|
// PrintRecoveryStack is a functional option to enable
|
|
// or disable printing stack traces on panic.
|
|
func PrintRecoveryStack(print bool) RecoveryOption {
|
|
return func(h http.Handler) {
|
|
r := h.(*recoveryHandler)
|
|
r.printStack = print
|
|
}
|
|
}
|
|
|
|
func (h recoveryHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
|
|
defer func() {
|
|
if err := recover(); err != nil {
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
h.log(err)
|
|
}
|
|
}()
|
|
|
|
h.handler.ServeHTTP(w, req)
|
|
}
|
|
|
|
func (h recoveryHandler) log(v ...interface{}) {
|
|
if h.logger != nil {
|
|
h.logger.Println(v...)
|
|
} else {
|
|
log.Println(v...)
|
|
}
|
|
|
|
if h.printStack {
|
|
stack := string(debug.Stack())
|
|
if h.logger != nil {
|
|
h.logger.Println(stack)
|
|
} else {
|
|
log.Println(stack)
|
|
}
|
|
}
|
|
}
|