支持热加载配置（HUP信号）

Author: cupen

Makefile

@@ -1,13 +1,13 @@
 project_name:=supervisor-event-listener
-project_version:=1.2.0
+project_version:=1.2.1
 root_dir := $(abspath $(CURDIR))
 build_dir := $(root_dir)/build
 GOPATH := ${HOME}/go
 
 
 .PHONY: clean
 clean:
-	rm -fr $(buld_dir)
+	rm -fr $(build_dir)
 
 .PHONY: build-bydocker
 build-bydocker:

listener/listener.go

@@ -13,10 +13,16 @@ import (
 )
 
 var (
+	// ErrPayloadLength ...
 	ErrPayloadLength = errors.New("Header中len长度与实际读取长度不一致")
 )
 
+// Start ...
 func Start() {
+	go run()
+}
+
+func run() {
 	for {
 		defer func() {
 			if err := recover(); err != nil {

notify/init.go

@@ -1,23 +1,20 @@
 package notify
 
 import (
+	"fmt"
+	"os"
+	"strings"
 	"sync/atomic"
-	"syscall"
+	"time"
 
 	"github.com/ouqiang/supervisor-event-listener/conf"
 	"github.com/ouqiang/supervisor-event-listener/event"
 	"github.com/ouqiang/supervisor-event-listener/utils/errlog"
-
-	"fmt"
-	"os"
-	"os/signal"
-	"time"
 )
 
 var (
-	confFilePath string
-	chanMsg      = make(chan *event.Message, 2048)
-	chanSig      = make(chan os.Signal, 128)
+	chanMsg    = make(chan *event.Message, 2048)
+	chanReload = make(chan *conf.Config, 16)
 	// notifiables  map[string]Notifiable
 	notifiables atomic.Value
 )
@@ -26,7 +23,6 @@ func Init(conf *conf.Config) error {
 	if conf == nil {
 		return fmt.Errorf("nil config")
 	}
-	signal.Notify(chanSig, syscall.SIGHUP)
 
 	m := map[string]Notifiable{}
 	if conf.WebHook != nil {
@@ -48,11 +44,23 @@ func Init(conf *conf.Config) error {
 	return nil
 }
 
-func Reload() error {
-	fpath := confFilePath
-	errlog.Info("loading config: %s", fpath)
+func Reload(conf *conf.Config) {
+	chanReload <- conf
+}
+
+func reload(conf *conf.Config) error {
+	if err := Init(conf); err != nil {
+		errlog.Info("loading config failed. %v", err)
+		return err
+	}
+	names := []string{}
+	for name := range Get() {
+		names = append(names, name)
+	}
+	errlog.Info("reloaded config: %s", strings.Join(names, " "))
 	return nil
 }
+
 func Push(msg *event.Message) {
 	chanMsg <- msg
 }
@@ -68,21 +76,14 @@ func run() {
 			errlog.Info("msg=%s", msg.ToJson(2))
 			handleMessage(msg)
 			time.Sleep(50 * time.Millisecond)
-		case sig := <-chanSig:
-			handleSignal(sig)
+		case conf := <-chanReload:
+			_ = reload(conf)
 		default:
 			time.Sleep(50 * time.Millisecond)
 		}
 	}
 }
 
-func handleSignal(sig os.Signal) error {
-	if sig != syscall.SIGHUP {
-		return fmt.Errorf("invalid signal %v", sig)
-	}
-	return Reload()
-}
-
 func handleMessage(msg *event.Message) error {
 	errlog.Debug("message: %+v\n", msg)
 	m := Get()

supervisor-event-listener.go

@@ -4,13 +4,19 @@ import (
 	"flag"
 	"log"
 	"os"
+	"os/signal"
+	"syscall"
 
 	"github.com/ouqiang/supervisor-event-listener/conf"
 	"github.com/ouqiang/supervisor-event-listener/listener"
 	"github.com/ouqiang/supervisor-event-listener/notify"
 	"github.com/ouqiang/supervisor-event-listener/utils/errlog"
 )
 
+var (
+	chanSig = make(chan os.Signal, 128)
+)
+
 func main() {
 	defer func() {
 		if err := recover(); err != nil {
@@ -38,4 +44,18 @@ func main() {
 	}
 	notify.Start()
 	listener.Start()
+
+	signal.Notify(chanSig, syscall.SIGHUP)
+	for sig := range chanSig {
+		switch sig {
+		case syscall.SIGHUP:
+			if err := conf.Reload(*configFile); err != nil {
+				errlog.Error("config init failed. err: %v", err)
+				continue
+			}
+			notify.Reload(conf.Get())
+		default:
+			errlog.Info("unexpected signal %v", sig)
+		}
+	}
 }