good morning!!!!

Skip to content
Snippets Groups Projects
Commit 90a302f5 authored by Garet Halliday's avatar Garet Halliday
Browse files

better

parent 26180413
No related branches found
No related tags found
No related merge requests found
...@@ -4,9 +4,5 @@ set -e ...@@ -4,9 +4,5 @@ set -e
EXEC_BIN_PATH=${PGGAT_BIN_PATH:=/usr/bin/pggat} EXEC_BIN_PATH=${PGGAT_BIN_PATH:=/usr/bin/pggat}
pggat() { pggat() {
if [[ ! -v "${PGGAT_RUN_MODE}" ]]; then exec $EXEC_BIN_PATH run --adapter="caddyfile" --config="/presets/${PGGAT_RUN_MODE:-default}.Caddyfile"
exec $EXEC_BIN_PATH run
else
exec $EXEC_BIN_PATH run --adapter="caddyfile" --config="/presets/${PGGAT_RUN_MODE}.Caddyfile"
fi
} }
package gatcaddyfile package gatcaddyfile
import ( import (
error_handler "gfx.cafe/gfx/pggat/lib/gat/handlers/error"
"gfx.cafe/gfx/pggat/lib/gat/handlers/pgbouncer_spilo" "gfx.cafe/gfx/pggat/lib/gat/handlers/pgbouncer_spilo"
"strconv" "strconv"
"strings" "strings"
...@@ -106,6 +107,17 @@ func init() { ...@@ -106,6 +107,17 @@ func init() {
Value: value, Value: value,
}, nil }, nil
}) })
RegisterDirective(Handler, "error", func(d *caddyfile.Dispenser, _ *[]caddyconfig.Warning) (caddy.Module, error) {
if !d.NextArg() {
return nil, d.ArgErr()
}
message := d.Val()
return &error_handler.Module{
Message: message,
}, nil
})
RegisterDirective(Handler, "pgbouncer", func(d *caddyfile.Dispenser, _ *[]caddyconfig.Warning) (caddy.Module, error) { RegisterDirective(Handler, "pgbouncer", func(d *caddyfile.Dispenser, _ *[]caddyconfig.Warning) (caddy.Module, error) {
var config = "pgbouncer.ini" var config = "pgbouncer.ini"
if d.NextArg() { if d.NextArg() {
......
package error_handler
import (
"gfx.cafe/gfx/pggat/lib/fed"
"gfx.cafe/gfx/pggat/lib/gat"
"gfx.cafe/gfx/pggat/lib/perror"
"github.com/caddyserver/caddy/v2"
)
func init() {
caddy.RegisterModule((*Module)(nil))
}
type Module struct {
Message string `json:"message"`
}
func (T *Module) CaddyModule() caddy.ModuleInfo {
return caddy.ModuleInfo{
ID: "pggat.handlers.error",
New: func() caddy.Module {
return new(Module)
},
}
}
func (T *Module) Handle(_ *fed.Conn) error {
return perror.New(
perror.FATAL,
perror.InternalError,
T.Message,
)
}
var _ gat.Handler = (*Module)(nil)
var _ caddy.Module = (*Module)(nil)
...@@ -16,6 +16,7 @@ import ( ...@@ -16,6 +16,7 @@ import (
// middlewares // middlewares
_ "gfx.cafe/gfx/pggat/lib/gat/handlers/allowed_startup_parameters" _ "gfx.cafe/gfx/pggat/lib/gat/handlers/allowed_startup_parameters"
_ "gfx.cafe/gfx/pggat/lib/gat/handlers/error"
_ "gfx.cafe/gfx/pggat/lib/gat/handlers/require_ssl" _ "gfx.cafe/gfx/pggat/lib/gat/handlers/require_ssl"
_ "gfx.cafe/gfx/pggat/lib/gat/handlers/rewrite_database" _ "gfx.cafe/gfx/pggat/lib/gat/handlers/rewrite_database"
_ "gfx.cafe/gfx/pggat/lib/gat/handlers/rewrite_parameter" _ "gfx.cafe/gfx/pggat/lib/gat/handlers/rewrite_parameter"
......
:5432 {
error "server is not configured"
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment