Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle SIGTERM signal in mqtrigger subscriber (#2029)

Browse Source 
In test_mqtrigger.sh and test_mqtrigger_error.sh tests, we timeout program
if not received right output. Ensuring we capture timeout signal and do program
cleanup accordingly. Also printing due to which signal program failed.

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2021-05-18 16:26:44 +05:30
committed by GitHub
parent 2a014e56b0
commit ee4feb17c4
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/tests/mqtrigger/nats/stan-sub/main.go
+4 -3
View File
@@ -23,6 +23,7 @@ import (
"log" "log"
"os" "os"
"os/signal" "os/signal"
"syscall"
"time" "time"
nats "github.com/nats-io/nats.go" nats "github.com/nats-io/nats.go"
@@ -168,10 +169,10 @@ func main() {
// Run cleanup when signal is received // Run cleanup when signal is received
signalChan := make(chan os.Signal, 1) signalChan := make(chan os.Signal, 1)
cleanupDone := make(chan bool) cleanupDone := make(chan bool)
signal.Notify(signalChan, os.Interrupt) signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM)
go func() { go func() {
for range signalChan { for sig := range signalChan {
fmt.Printf("\nReceived an interrupt, unsubscribing and closing connection...\n\n") fmt.Printf("\nReceived signal %s, unsubscribing and closing connection...\n\n", sig.String())
// Do not unsubscribe a durable on exit, except if asked to. // Do not unsubscribe a durable on exit, except if asked to.
if durable == "" || unsubscribe { if durable == "" || unsubscribe {
sub.Unsubscribe() sub.Unsubscribe()
test/tests/mqtrigger/nats/test_mqtrigger.sh
+1 -1
View File
@@ -59,7 +59,7 @@ go run $DIR/stan-pub/main.go -s $FISSION_NATS_STREAMING_URL -c $clusterID -id $p
# Wait for message on response topic # Wait for message on response topic
# #
log "Waiting for response" log "Waiting for response"
response=$(timeout 5s go run $DIR/stan-sub/main.go --last -s $FISSION_NATS_STREAMING_URL -c $clusterID -id $subClientID $resptopic 2>&1 || true) response=$(timeout 10s go run $DIR/stan-sub/main.go --last -s $FISSION_NATS_STREAMING_URL -c $clusterID -id $subClientID $resptopic 2>&1 || true)
log "Output from subscriber" log "Output from subscriber"
echo "$response" echo "$response"
echo "$response" | grep "$expectedRespOutput" echo "$response" | grep "$expectedRespOutput"
test/tests/mqtrigger/nats/test_mqtrigger_error.sh
+1 -1
View File
@@ -63,7 +63,7 @@ go run $DIR/stan-pub/main.go -s $FISSION_NATS_STREAMING_URL -c $clusterID -id $p
# Wait for message on error topic # Wait for message on error topic
# #
log "Waiting for response" log "Waiting for response"
response=$(timeout 5s go run $DIR/stan-sub/main.go --last -s $FISSION_NATS_STREAMING_URL -c $clusterID -id $subClientID $errortopic 2>&1 || true) response=$(timeout 10s go run $DIR/stan-sub/main.go --last -s $FISSION_NATS_STREAMING_URL -c $clusterID -id $subClientID $errortopic 2>&1 || true)
log "Output from subscriber" log "Output from subscriber"
echo "$response" echo "$response"
echo "$response" | grep "$expectedRespOutput" echo "$response" | grep "$expectedRespOutput"