Stop rpc server on quit (#99)

Makefile

@@ -21,7 +21,8 @@ endif
 
 GO_ENV := GO111MODULE=on $(GO_ENV)
 
-GO_FLAGS=-ldflags "-w"
+GO ?= go
+GO_FLAGS = -ldflags "-w -X main.version=`git describe --tags --always --dirty`"
 
 all: clean wb-rules
 
@@ -36,7 +37,7 @@ test:
 	CC=x86_64-linux-gnu-gcc go test -v -trimpath -ldflags="-s -w" ./wbrules
 
 wb-rules: main.go wbrules/*.go
-	$(GO_ENV) go build -trimpath -ldflags "-w -X main.version=`git describe --tags --always --dirty`"
+	$(GO_ENV) $(GO) build -trimpath $(GO_FLAGS)
 
 install:
 	mkdir -p $(DESTDIR)/etc/init.d/

debian/changelog

@@ -1,3 +1,9 @@
+wb-rules (2.18.10) stable; urgency=medium
+
+  * Stop rpc server on quit
+
+ -- Nikolay Korotkiy <nikolay.korotkiy@wirenboard.com>  Wed, 17 Jan 2023 10:34:00 +0400
+
 wb-rules (2.18.9) stable; urgency=medium
 
   * Add arm64 build, no functional changes

main.go

@@ -146,6 +146,8 @@ func main() {
 	wbgong.Info.Println("wait for driver to become ready")
 	driver.WaitForReady()
 	wbgong.Info.Println("driver is ready")
+	defer driver.Close()
+	defer driver.StopLoop()
 
 	engineOptions := wbrules.NewESEngineOptions()
 	engineOptions.SetPersistentDBFile(*persistentDbFile)
@@ -163,6 +165,7 @@ func main() {
 		wbgong.Error.Fatalf("error creating engine: %s", err)
 	}
 	engine.Start()
+	defer engine.Stop()
 
 	gotSome := false
 	watcher := wbgong.NewDirWatcher("\\.js(\\"+wbrules.FILE_DISABLED_SUFFIX+")?$", engine)
@@ -185,12 +188,9 @@ func main() {
 		rpc := wbgong.NewMQTTRPCServer("wbrules", engineMqttClient)
 		rpc.Register(wbrules.NewEditor(engine))
 		rpc.Start()
+		defer rpc.Stop()
 	}
 
 	// wait for quit signal
 	<-exitCh
-
-	engine.Stop()
-	driver.StopLoop()
-	driver.Close()
 }