feat(*) accept kong-prefix instead of socket name

This commit replaces the `-socket` flag with `-kong-prefix` and
hardcodes the socket name, which is expected by Kong to be in the Kong
prefix.
This commit is contained in:
Guilherme Salazar
2020-01-06 12:46:19 -08:00
parent 53790d0342
commit da8ce4fa7e
2 changed files with 8 additions and 11 deletions

15
main.go
View File

@@ -12,15 +12,12 @@ import (
"reflect" "reflect"
) )
var socket = flag.String("socket", "", "Socket to listen into") var kongPrefix = flag.String("kong-prefix", "/usr/local/kong", "Kong prefix path (specified by the `-p` argument commonly used in the `kong` cli)")
var socket string
func init() { func init() {
flag.Parse() flag.Parse()
socket = *kongPrefix + "/" + "go_pluginserver.sock"
if *socket == "" {
flag.Usage()
os.Exit(2)
}
} }
func runServer(listener net.Listener) { func runServer(listener net.Listener) {
@@ -46,13 +43,13 @@ func runServer(listener net.Listener) {
} }
func main() { func main() {
err := os.Remove(*socket) err := os.Remove(socket)
if err != nil && !os.IsNotExist(err) { if err != nil && !os.IsNotExist(err) {
log.Printf(`removing "%s": %s`, socket, err) log.Printf(`removing "%s": %s`, kongPrefix, err)
return return
} }
listener, err := net.Listen("unix", *socket) listener, err := net.Listen("unix", socket)
if err != nil { if err != nil {
log.Printf(`listen("%s"): %s`, socket, err) log.Printf(`listen("%s"): %s`, socket, err)
return return

View File

@@ -12,14 +12,14 @@ rq --help >/dev/null
echo "pwd: $PWD" echo "pwd: $PWD"
SOCKET='sock' SOCKET='go_pluginserver.sock'
if pgrep go-pluginserver -l; then if pgrep go-pluginserver -l; then
PREVIOUS_SERVER="yes" PREVIOUS_SERVER="yes"
else else
echo "starting server..." echo "starting server..."
[ -S "$SOCKET" ] && rm "$SOCKET" [ -S "$SOCKET" ] && rm "$SOCKET"
./go-pluginserver -socket "$SOCKET" & ./go-pluginserver -kong-prefix . &
pgrep go-pluginserver -l pgrep go-pluginserver -l
sleep 0.1s sleep 0.1s
fi fi