重构，加入消息时间

Author: cupen

.gitignore

@@ -1,5 +1,5 @@
 # Binaries for programs and plugins
-./supervisor-event-listener
+supervisor-event-listener
 *.exe
 *.dll
 *.so
@@ -15,4 +15,5 @@
 .glide/
 .idear
 vendor/**/*.yml
-vendor/**/.gitignore
+vendor/**/.gitignore
+build/

Makefile

@@ -1,10 +1,44 @@
+LDFLAGS:=-w
+BUILD_DIR:=./build/
+PROJECT_NAME:=supervisor-event-listener
+VERSION:=1.1.0
 
 install:
-	sudo supervisorctl stop alert
-	go build
+	cp ./supervisor-event-listener /usr/local/bin/
+
+
+test-integration:
+	sudo supervisorctl stop supervisor-event-listener
+	go build 
 	sudo cp ./supervisor-event-listener /usr/local/bin/
-	sudo supervisorctl start alert
+	sudo cp ./tests/supervisor-app.ini /etc/supervisor.d/
+	sudo supervisorctl start  supervisor-event-listener
+	sudo supervisorctl update
+	sudo supervisorctl start sleep-then-exit
+
+
+clean:
+	rm -fr $(BUILD_DIR)
+
+
+release: 
+	GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS)
+	rm -fr                             $(BUILD_DIR)/$(PROJECT_NAME)/
+	mkdir -p                           $(BUILD_DIR)/$(PROJECT_NAME)/
+	mv ./supervisor-event-listener     $(BUILD_DIR)/$(PROJECT_NAME)/
+	cp ./supervisor-event-listener.ini $(BUILD_DIR)/$(PROJECT_NAME)/
+	cd $(BUILD_DIR) && tar -zcvf $(PROJECT_NAME)-$(VERSION).tar.gz $(PROJECT_NAME)
+	@echo ...done.
+
 
-test:
-	sudo supervisorctl start test
+log:
+	tmux new-session -d -s dev
+	tmux split-window -t "dev:0"
+	tmux split-window -t "dev:0.0" -h
+	tmux split-window -t "dev:0.2" -h
+	tmux send-keys -t "dev:0.0" "bash -c 'tail -f /tmp/supervisor-event-listener.log'" Enter
+	tmux send-keys -t "dev:0.1" "bash -c 'sudo supervisorctl tail -f supervisor-event-listener'" Enter
+	tmux set-option -g mouse on
+	tmux attach -t dev
+	tmux kill-session -t dev
 

config/config.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"flag"
 	"fmt"
 	"os"
 	"strings"
@@ -48,10 +47,7 @@ type MailUser struct {
 	Email []string
 }
 
-func ParseConfig() *Config {
-	var configFile string
-	flag.StringVar(&configFile, "c", "/etc/supervisor-event-listener.ini", "config file")
-	flag.Parse()
+func ParseConfig(configFile string) *Config {
 	configFile = strings.TrimSpace(configFile)
 	if configFile == "" {
 		Exit("请指定配置文件路径")

event/event.go

@@ -1,23 +1,68 @@
 package event
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/ouqiang/supervisor-event-listener/utils"
 	"os"
 	"strconv"
 	"strings"
+	"time"
+
+	"github.com/ouqiang/supervisor-event-listener/utils"
 )
 
 // Message 消息格式
 type Message struct {
+	TS      time.Time
 	Header  *Header
 	Payload *Payload
 }
 
+func NewMessage(h *Header, p *Payload) Message {
+	return Message{
+		TS:      time.Now(),
+		Header:  h,
+		Payload: p,
+	}
+}
+
 func (msg *Message) String() string {
-	return fmt.Sprintf("Host: %s\nProcess: %s\nPID: %d\nEXITED FROM state: %s", msg.Payload.Ip, msg.Payload.ProcessName, msg.Payload.Pid, msg.Payload.FromState)
+	tmpl := `Host: %s
+Process: %s
+PID: %d
+EXITED FROM state: %s
+Date: %s`
+	return fmt.Sprintf(tmpl,
+		msg.Payload.Ip,
+		msg.Payload.ProcessName,
+		msg.Payload.Pid,
+		msg.Payload.FromState,
+		msg.TS.Format(time.RFC3339),
+	)
+}
 
+func (msg *Message) ToJson(indent ...int) string {
+	realIndent := 0
+	if len(indent) > 0 {
+		realIndent = indent[0]
+	}
+	t := ""
+	switch realIndent {
+	case 0:
+	case 1:
+		t = " "
+	case 2:
+		t = "  "
+	case 3:
+		t = "   "
+	case 4:
+		t = "    "
+	default:
+		t = "    "
+	}
+	_bytes, _ := json.MarshalIndent(msg, "", t)
+	return string(_bytes)
 }
 
 // Header Supervisord触发事件时会先发送Header，根据Header中len字段去读取Payload

listener/listener.go

@@ -4,24 +4,27 @@ import (
 	"bufio"
 	"errors"
 	"fmt"
+	"log"
+	"os"
+
 	"github.com/ouqiang/supervisor-event-listener/event"
 	"github.com/ouqiang/supervisor-event-listener/listener/notify"
 	"github.com/ouqiang/supervisor-event-listener/utils/tmpfslog"
-	"log"
-	"os"
 )
 
 var (
 	ErrPayloadLength = errors.New("Header中len长度与实际读取长度不一致")
 )
 
 func Start() {
-	defer func() {
-		if err := recover(); err != nil {
-			log.Print("panic", err)
-		}
-	}()
-	listen()
+	for {
+		defer func() {
+			if err := recover(); err != nil {
+				log.Print("panic", err)
+			}
+		}()
+		listen()
+	}
 }
 
 // 监听事件, 从标准输入获取事件内容
@@ -30,13 +33,13 @@ func listen() {
 	for {
 		ready()
 		header, err := readHeader(reader)
-		tmpfslog.Info("header:%+v err:%+v", header, err)
+		tmpfslog.Debug("header:%+v err:%+v", header, err)
 		if err != nil {
 			failure(err)
 			continue
 		}
 		payload, err := readPayload(reader, header.Len)
-		tmpfslog.Info("payloadL%+v err:%+v", payload, err)
+		tmpfslog.Debug("payloadL%+v err:%+v", payload, err)
 		if err != nil {
 			failure(err)
 			continue

listener/notify/bearychat.go

@@ -16,7 +16,7 @@ func (this *BearyChat) Send(msg event.Message) error {
 	timeout := Conf.BearyChat.Timeout
 
 	params := map[string]interface{}{
-		"text": msg.String(),
+		"text": this.format(msg),
 	}
 	if channel != "" {
 		params["channel"] = channel
@@ -26,17 +26,15 @@ func (this *BearyChat) Send(msg event.Message) error {
 	if err != nil {
 		return err
 	}
-	tmpfslog.Info("url: %s", url)
-	tmpfslog.Info("timeout: %d", timeout)
-	tmpfslog.Info("params: %v", params)
-
 	resp := httpclient.PostJson(url, string(body), timeout)
 	if !resp.IsOK() {
+		tmpfslog.Error("params: %v err: %v", params, resp.Error())
 		return resp.Error()
 	}
 	return nil
 }
 
 func (this *BearyChat) format(msg event.Message) string {
-	return ""
+	// return msg.ToJson(4)
+	return msg.String()
 }

listener/notify/notify.go renamed to listener/notify/init.go

@@ -15,28 +15,31 @@ var (
 	queue chan event.Message
 )
 
-func init() {
-	Conf = config.ParseConfig()
-
-	tmpfslog.Info("loading config: %+v\n", Conf)
+func Init(fpath string) error {
+	tmpfslog.Info("loading config: %s", fpath)
+	Conf = config.ParseConfig(fpath)
 	queue = make(chan event.Message, 10)
-	go start()
+	return nil
 }
 
 type Notifiable interface {
 	Send(event.Message) error
 }
 
 func Push(header *event.Header, payload *event.Payload) {
-	queue <- event.Message{header, payload}
+	queue <- event.NewMessage(header, payload)
+}
+
+func Start() {
+	go start()
 }
 
 func start() {
 	var message event.Message
 	var notifyHandler Notifiable
 	for {
 		message = <-queue
-		tmpfslog.Info("%+v\n", message)
+		tmpfslog.Debug("message: %+v\n", message)
 		switch Conf.NotifyType {
 		case "mail":
 			notifyHandler = &Mail{}

supervisor-event-listener.go

@@ -1,11 +1,37 @@
 package main
 
 import (
+	"flag"
+	"log"
+	"os"
+
 	"github.com/ouqiang/supervisor-event-listener/listener"
+	"github.com/ouqiang/supervisor-event-listener/listener/notify"
+	"github.com/ouqiang/supervisor-event-listener/utils/tmpfslog"
 )
 
 func main() {
-	for {
-		listener.Start()
+	defer func() {
+		if err := recover(); err != nil {
+			log.Print("panic", err)
+			os.Exit(127)
+		}
+	}()
+
+	var configFile string
+	var dryRun bool
+	flag.StringVar(&configFile, "c", "/etc/supervisor-event-listener.ini", "config file")
+	flag.BoolVar(&dryRun, "dryRun", false, "dry run, lint config file")
+	flag.Parse()
+	err := notify.Init(configFile)
+	if err != nil {
+		tmpfslog.Error("notify init failed. err: %+v", err)
+		os.Exit(127)
 	}
+	if dryRun {
+		return
+	}
+
+	notify.Start()
+	listener.Start()
 }

supervisor-event-listener.ini

@@ -1,5 +1,5 @@
 [default]
-# 通知类型 mail,slack,webhook 只能选择一种
+# 通知类型 mail,slack,webhook,bearychat 只能选择一种
 notify_type = mail
 
 # 邮件服务器配置
@@ -19,6 +19,6 @@ slack.channel = exception
 webhook_url = http://my.webhook.com
 
 # BearyChat
-bearychat.webhook_url = https://xx/xx
-bearychat.channel = 
+bearychat.webhook_url = https://hook.bearychat.com/=xxx/xxxxx/xxxx
+bearychat.channel = alert
 bearychat.timeout = 8

supervisor-event-listener.toml

@@ -20,7 +20,7 @@ channel = "exception"
 
 # Custom WebHook 
 [webhook]
-url = "http://my.webhook.com"
+url = "https://my.webhook.com"
 
 
 # BearyChat

tests/supervisor-app.ini

@@ -0,0 +1,13 @@
+[eventlistener:supervisor-event-listener]
+command=/usr/local/bin/supervisor-event-listener 
+    -c /etc/supervisor-event-listener.ini
+events=
+    PROCESS_STATE_EXITED,
+    PROCESS_STATE_FATAL,
+    PROCESS_STATE_STOPPED,
+    PROCESS_STATE_RUNNING
+user=nobody
+group=nobody
+
+[program:sleep-then-exit]
+command=sleep 3 && exit 1