From eb112d17e24c09f4bca8cefc677ba16d4701a413 Mon Sep 17 00:00:00 2001 From: "Kelvin Ly (on the cloud)" Date: Fri, 19 Jul 2019 03:16:57 +0000 Subject: [PATCH] Fix bugs --- main.go | 3 ++- stop-server.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 7335f81..0493b45 100644 --- a/main.go +++ b/main.go @@ -13,6 +13,7 @@ import ( "net/http" "os" "os/exec" + "path" "strconv" "strings" "syscall" @@ -172,7 +173,7 @@ func main() { daemon.AddCommand(daemon.StringFlag(signal, "stop"), syscall.SIGTERM, termHandler) daemon.AddCommand(daemon.StringFlag(signal, "reload"), syscall.SIGHUP, reloadHandler) - execName := os.Args[0] + execName := path.Base(os.Args[0]) cntxt := &daemon.Context{ PidFileName: "/tmp/" + execName + "-pid", PidFilePerm: 0644, diff --git a/stop-server.sh b/stop-server.sh index c233851..a4a0592 100755 --- a/stop-server.sh +++ b/stop-server.sh @@ -3,5 +3,5 @@ SCRIPT=`realpath $0` SCRIPTPATH=`dirname $SCRIPT` BASENAME=`basename $SCRIPTPATH` -echo $BASENAME +echo "killing $BASENAME" kill `cat /tmp/$BASENAME-pid`