feat(main): cleanup on signal SIGTERM

marjune163 · marjune163 · commit 45603d885987 · 2022-08-10T21:21:41.000+08:00
diff --git a/src/main.go b/src/main.go
@@ -11,9 +11,9 @@ import (
 	"syscall"
 )
 
-func cleanupOnInterrupt(appInst *app.App) {
+func cleanupOnEnd(appInst *app.App) {
 	chSignal := make(chan os.Signal)
-	signal.Notify(chSignal, syscall.SIGINT)
+	signal.Notify(chSignal, syscall.SIGINT, syscall.SIGTERM)
 
 	go func() {
 		<-chSignal
@@ -22,7 +22,7 @@ func cleanupOnInterrupt(appInst *app.App) {
 	}()
 }
 
-func reOpenLogOnHup(appInst *app.App) {
+func reopenLogOnHup(appInst *app.App) {
 	chSignal := make(chan os.Signal)
 	signal.Notify(chSignal, syscall.SIGHUP)
 
@@ -53,8 +53,8 @@ func main() {
 		serverError.CheckFatal(errors.New("failed to create application instance"))
 	}
 
-	cleanupOnInterrupt(appInst)
-	reOpenLogOnHup(appInst)
+	cleanupOnEnd(appInst)
+	reopenLogOnHup(appInst)
 	errs = appInst.Open()
 	serverError.CheckFatal(errs...)
 
diff --git a/test/case/001.basic.bash b/test/case/001.basic.bash
@@ -25,4 +25,4 @@ assert $(curl_head_status 'http://127.0.0.1:3003/escape-escaped%252fslash/') '20
 assert $(curl_head_status 'http://127.0.0.1:3003/escape%23sharp') '200'
 assert $(curl_head_status 'http://127.0.0.1:3003/escape%25percent') '200'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/002.vhost.bash b/test/case/002.vhost.bash
@@ -11,4 +11,4 @@ assert "$vh1file1" 'vhost1/file1.txt'
 vh2file1=$(curl_get_body http://127.0.0.2:3003/file1.txt)
 assert "$vh2file1" 'vhost2/file1.txt'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/003.vhost.tls.bash b/test/case/003.vhost.tls.bash
@@ -11,4 +11,4 @@ assert "$vh1file1" 'vhost1/file1.txt'
 vh2file1=$(curl_get_body https://127.0.0.2:3003/file1.txt)
 assert "$vh2file1" 'vhost2/file1.txt'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/004.alias.bash b/test/case/004.alias.bash
@@ -32,4 +32,4 @@ assert "$status" '404'
 baz=$(curl_get_body http://127.0.0.1:3003/foo/bar/baz/b1.txt)
 assert "$baz" 'vhost2/b/b1.txt'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/005.alias.empty.root.alias.root.bash b/test/case/005.alias.empty.root.alias.root.bash
@@ -11,4 +11,4 @@ assert "$file1status" '200'
 file1headstatus=$(curl_head_status http://127.0.0.1:3003/file1.txt)
 assert "$file1headstatus" '200'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/005.alias.empty.root.bash b/test/case/005.alias.empty.root.bash
@@ -23,4 +23,4 @@ assert "$go" 'vhost1/go/index.txt'
 yes=$(curl_get_body http://127.0.0.1:3003/not/exist/name/index.txt)
 assert "$yes" 'vhost1/yes/index.txt'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/007.auth.bash b/test/case/007.auth.bash
@@ -17,4 +17,4 @@ assert "$userhellostatus" '200'
 userhelloheadstatus=$(curl_head_status http://alice:AliceSecret@127.0.0.1:3003/hello/)
 assert "$userhelloheadstatus" '200'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/008.dir.index.bash b/test/case/008.dir.index.bash
@@ -8,4 +8,4 @@ sleep 0.05 # wait server ready
 yes=$(curl_get_body http://127.0.0.1:3003/yes)
 assert "$yes" 'vhost1/yes/index.txt'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/009.alias.dir.index.bash b/test/case/009.alias.dir.index.bash
@@ -8,4 +8,4 @@ sleep 0.05 # wait server ready
 world=$(curl_get_body http://127.0.0.1:3003/foo)
 assert "$world" 'vhost1/go/index.txt'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/010.download.bash b/test/case/010.download.bash
@@ -11,4 +11,4 @@ sleep 0.05 # wait server ready
 (curl_get_header http://127.0.0.1:3003/file1.txt?download | grep -q -i -F 'content-disposition') ||
 	fail "Content-Disposition header is not exists"
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/011.upload.bash b/test/case/011.upload.bash
@@ -68,4 +68,4 @@ uploaded=$(cat "$fs"/uploaded/2/isub/iuploaded.tmp)
 assert "$uploaded" "$content"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/012.alias.upload.bash b/test/case/012.alias.upload.bash
@@ -34,4 +34,4 @@ curl_upload_content 'http://127.0.0.1:3003/?upload' dirfile mycontent 'my/mydir/
 [ -e "$fs"/vhost1/my ] && fail "$fs/vhost1/my should not exists"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/014.alias.delete.bash b/test/case/014.alias.delete.bash
@@ -23,4 +23,4 @@ curl_head_status 'http://127.0.0.1:3003/share/dir?delete&name=2.tmp' > /dev/null
 [ -e "$file2" ] && fail "$file2 should not exists"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/015.delete.bash b/test/case/015.delete.bash
@@ -23,4 +23,4 @@ curl_head_status 'http://127.0.0.1:3003/2?delete&name=2.tmp' > /dev/null
 ls "$file2" &> /dev/null && fail "$file2 exists"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/016.alias.delete.bash b/test/case/016.alias.delete.bash
@@ -23,4 +23,4 @@ curl_head_status 'http://127.0.0.1:3003/share/dir?delete&name=2.tmp' > /dev/null
 [ -e "$file2" ] && fail "$file2 should not exists"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/018.alias.shadowed.delete.bash b/test/case/018.alias.shadowed.delete.bash
@@ -23,4 +23,4 @@ curl_head_status 'http://127.0.0.1:3003/?delete&name=y.tmp' > /dev/null
 [ -e "$file2" ] || fail "$file2 should exists"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/020.mkdir.bash b/test/case/020.mkdir.bash
@@ -15,4 +15,4 @@ curl_head_status 'http://127.0.0.1:3003/1/?mkdir&name=foo.tmp' > /dev/null
 [ -d "$file1" ] || fail "$file1 should exists as directory"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/021.alias.mkdir.bash b/test/case/021.alias.mkdir.bash
@@ -19,4 +19,4 @@ curl_head_status 'http://127.0.0.1:3003/share/dir/?mkdir&name=bar.tmp' > /dev/nu
 [ -d "$file2" ] || fail "$file2 should exists as directory"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/022.alias.shadowed.mkdir.bash b/test/case/022.alias.shadowed.mkdir.bash
@@ -19,4 +19,4 @@ curl_head_status 'http://127.0.0.1:3003/?mkdir&name=y.tmp' > /dev/null
 [ -e "$file2" ] && fail "$file2 should not exists"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/023.mkdirp.bash b/test/case/023.mkdirp.bash
@@ -15,4 +15,4 @@ curl_head_status 'http://127.0.0.1:3003/1/?mkdir&name=foo/bar/baz.tmp' > /dev/nu
 [ -d "$file1" ] || fail "$file1 should exists as directory"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/024.alias.mkdirp.bash b/test/case/024.alias.mkdirp.bash
@@ -19,4 +19,4 @@ curl_head_status 'http://127.0.0.1:3003/1/?mkdir&name=my2.tmp/test' > /dev/null
 [ -e "$file2" ] && fail "$file2 should not exists"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/025.archive.bash b/test/case/025.archive.bash
@@ -26,4 +26,4 @@ curl_get_body 'http://127.0.0.1:3003/a?tar&name=a1.txt' > "$archive"
 (tar -tf "$archive" | grep -q 'a2.txt') && fail "a2.txt should not in $(basename $archive)"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/026.alias.archive.bash b/test/case/026.alias.archive.bash
@@ -27,4 +27,4 @@ curl_get_body 'http://127.0.0.1:3003/?tar&name=hello/world/index.txt&name=go' >
 (tar -tf "$archive" | grep -q 'go/index.txt') || fail "go/index.txt should in $(basename $archive)"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/028.emptyroot.archive.bash b/test/case/028.emptyroot.archive.bash
@@ -22,4 +22,4 @@ curl_get_body 'http://127.0.0.1:3003/?tar&name=go' > "$archive"
 (tar -tf "$archive" | grep -q -E -v '^go/') && fail "unexpected file in $(basename $archive)"
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/029.sort.num.bash b/test/case/029.sort.num.bash
@@ -22,4 +22,4 @@ line5=$(curl_get_body http://127.0.0.1:3003/ | grep -n './hello-index.txt' | cut
 [ ! "$line3" -lt "$line4" ] && fail "line3 is not before line4"
 [ ! "$line4" -lt "$line5" ] && fail "line4 is not before line5"
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/030.sort.default.bash b/test/case/030.sort.default.bash
@@ -16,4 +16,4 @@ if [ $? -ne 0 ]; then
 fi
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/031.sort.custom.bash b/test/case/031.sort.custom.bash
@@ -16,4 +16,4 @@ if [ $? -ne 0 ]; then
 fi
 
 cleanup
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/032.custom.header.bash b/test/case/032.custom.header.bash
@@ -37,4 +37,4 @@ sleep 0.05 # wait server ready
 (curl_get_header http://127.0.0.1:3003/shortcut/vhost2 | grep -q -i 'X-Vh2-Name:\s*X-Vh2-Value') ||
 	fail "Custom header 'X-Vh2-Name:X-Vh2-Value' should exists"
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/033.redirect.https.bash b/test/case/033.redirect.https.bash
@@ -8,7 +8,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '200'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https 3005 --listen-plain 3003 --listen-tls 3004 --listen-tls 3005 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -19,7 +19,7 @@ assert "$status" '301'
 
 (curl_get_header http://127.0.0.1:3003/ | grep -i -q 'Location:\s*https://127.0.0.1:3005/') || fail 'Location not found'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 # --to-https empty
@@ -29,7 +29,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https --listen-plain 3003 --listen-tls :3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -38,7 +38,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https --listen-plain 3003 --listen-tls 127.0.0.1:3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -47,7 +47,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 # --to-https port
 "$ghfs" --to-https 3004 --listen-plain 3003 --listen-tls 3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -56,7 +56,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https 3004 --listen-plain 3003 --listen-tls :3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -65,7 +65,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https 3004 --listen-plain 3003 --listen-tls 127.0.0.1:3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -74,7 +74,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 # --to-https :port
 "$ghfs" --to-https :3004 --listen-plain 3003 --listen-tls 3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -83,7 +83,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https :3004 --listen-plain 3003 --listen-tls :3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -92,7 +92,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https :3004 --listen-plain 3003 --listen-tls 127.0.0.1:3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -101,7 +101,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 # --to-https IPv4:port
 "$ghfs" --to-https 127.0.0.1:3004 --listen-plain 3003 --listen-tls 3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -110,7 +110,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https 127.0.0.1:3004 --listen-plain 3003 --listen-tls :3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -119,7 +119,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https 127.0.0.1:3004 --listen-plain 3003 --listen-tls 127.0.0.1:3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -128,7 +128,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 # --to-https IPv6:port
 "$ghfs" --to-https '[::1]:3004' --listen-plain 3003 --listen-tls 3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -137,7 +137,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https '[::1]:3004' --listen-plain 3003 --listen-tls :3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -146,7 +146,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https '[::1]:3004' --listen-plain 3003 --listen-tls 127.0.0.1:3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -155,7 +155,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '301'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 # --to-https bad port
 "$ghfs" --to-https 3005 --listen-plain 3003 --listen-tls 3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -164,7 +164,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '200'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https 3005 --listen-plain 3003 --listen-tls :3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -173,7 +173,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '200'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --to-https 3005 --listen-plain 3003 --listen-tls 127.0.0.1:3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -182,4 +182,4 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '200'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/034.redirect.hsts.bash b/test/case/034.redirect.hsts.bash
@@ -8,7 +8,7 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '200'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
 
 
 "$ghfs" --hsts --listen-plain 3003 --listen-tls 3004 -c "$cert"/localhost.crt -k "$cert"/localhost.key -r "$fs"/vhost1 &
@@ -17,4 +17,4 @@ sleep 0.05 # wait server ready
 status=$(curl_get_status http://127.0.0.1:3003/)
 assert "$status" '200'
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/035.custom.theme.bash b/test/case/035.custom.theme.bash
@@ -23,4 +23,4 @@ sleep 0.05 # wait server ready
 (curl_get_body 'http://127.0.0.2:3003/?asset=index.js' | grep -q -F '/* index.js from custom theme */') ||
 	fail "Should use custom theme for vhost 2"
 
-jobs -p | xargs kill
+jobs -p | xargs kill &> /dev/null
diff --git a/test/case/036.custom.theme-dir.bash b/test/case/036.custom.theme-dir.bash
diff --git a/test/case/037.pid.file.bash b/test/case/037.pid.file.bash
diff --git a/test/case/038.url.prefix.bash b/test/case/038.url.prefix.bash
diff --git a/test/case/039.global.restrict.access.bash b/test/case/039.global.restrict.access.bash
diff --git a/test/case/040.restrict.access.bash b/test/case/040.restrict.access.bash
diff --git a/test/case/041.force.dir.slash.bash b/test/case/041.force.dir.slash.bash
diff --git a/test/case/041.force.dir.slash.status.code.bash b/test/case/041.force.dir.slash.status.code.bash
