fix:1.5.0

Author: yezihack

config/config.go

@@ -2,15 +2,16 @@ package config
 
 import (
 	"errors"
-	"github.com/howeyc/gopass"
-	"github.com/yezihack/github-webhook/util"
 	"os"
 	"strconv"
 	"strings"
+
+	"github.com/howeyc/gopass"
+	"github.com/yezihack/github-webhook/util"
 )
 
 var (
-	Version     = "v1.4.3"
+	Version     = "v1.5.0"
 	Author      = "barry"
 	Email       = "freeit@126.com"
 	Name        = "github-webhook"

internal/backend.go

@@ -0,0 +1,58 @@
+package internal
+
+import (
+	"fmt"
+	"sync"
+)
+
+// 变量
+var (
+	__backendOnce sync.Once
+	__backend     *Backend
+)
+
+type Backend struct {
+	pool  chan func() // 一个管道的池子
+	debug bool        // 是否启动调试
+}
+
+// 实例化对象
+// 不管实例多少次，对象就创建一次。
+func NewBackend(debug ...bool) *Backend {
+	__backendOnce.Do(func() {
+		var bug bool
+		if len(debug) > 0 {
+			bug = debug[0]
+		}
+		__backend = &Backend{
+			debug: bug,
+		}
+		__backend.pool = make(chan func(), 10) // 初使 pool
+		// 开启一个 goroutine
+		go __backend.monitor()
+	})
+	return __backend
+}
+
+// 添加服务
+func (b *Backend) Add(fn func()) {
+	if b.debug {
+		fmt.Println("add +1")
+	}
+	b.pool <- fn
+}
+
+// 监听服务
+func (b *Backend) monitor() {
+	for {
+		select {
+		case fn, ok := <-b.pool:
+			if b.debug {
+				fmt.Printf("ok:%v", ok)
+			}
+			if ok {
+				fn()
+			}
+		}
+	}
+}

internal/handler.go

@@ -3,12 +3,13 @@ package internal
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/tidwall/gjson"
-	"github.com/yezihack/github-webhook/logger"
-	"github.com/yezihack/github-webhook/util"
 	"io/ioutil"
 	"net/http"
 	"strings"
+
+	"github.com/tidwall/gjson"
+	"github.com/yezihack/github-webhook/logger"
+	"github.com/yezihack/github-webhook/util"
 )
 
 type WebHookHandler func(eventName string, payload *GitHubRepo, req *http.Request) error
@@ -56,6 +57,7 @@ func Handler(secret string, l logger.Logger, fn WebHookHandler) http.HandlerFunc
 			_fail(err)
 			return
 		}
+		fmt.Println("body", string(body))
 		log.Verbose("RequestBody:%s\n", string(body))
 		// Validate payload (only when secret is provided)
 		if secret != "" {
@@ -65,20 +67,6 @@ func Handler(secret string, l logger.Logger, fn WebHookHandler) http.HandlerFunc
 				return
 			}
 		}
-		// Get payload. from github data is encode. fix by 2020.04.20
-		//var payloadData []byte
-		//if contentType == "application/x-www-form-urlencoded" {
-		//	payloadSplit := strings.SplitN(string(body), "=", 2)
-		//	payloadUrlDecode, err := url.QueryUnescape(payloadSplit[1])
-		//	if err != nil {
-		//		log.Printf("RequestBody:%s\n", string(body))
-		//		_fail(err)
-		//		return
-		//	}
-		//	payloadData = []byte(payloadUrlDecode)
-		//} else if contentType == "application/json" {
-		//	payloadData = body
-		//}
 		repo := GitHubRepo{}
 		result := gjson.ParseBytes(body)
 		repo.Name = result.Get("repository.name").Str

router/router.go

@@ -2,14 +2,15 @@ package router
 
 import (
 	"fmt"
+	"net/http"
+	"os"
+	"time"
+
 	"github.com/yezihack/github-webhook/config"
 	"github.com/yezihack/github-webhook/internal"
 	"github.com/yezihack/github-webhook/logger"
 	"github.com/yezihack/github-webhook/util"
 	"github.com/yezihack/gorestful"
-	"net/http"
-	"os"
-	"time"
 )
 
 var (
@@ -23,18 +24,25 @@ func New(cfg config.Config) error {
 	}
 	log = logger.NewLogger(cfg.Quiet, cfg.Verbose)
 	router := gorestful.New()
+	router.GET("/", pong)
 	router.GET("/ping", pong)
 	router.POST("/web-hook", webHookLog(cfg))
 	addr := fmt.Sprintf(":%d", cfg.Port)
-	go func() {
-		log.Printf("%s %d %s\n", time.Now().Format("2006/01/02 15:04:05"), os.Getpid(), addr)
-	}()
+	go log.Printf("%s %d %s\n", time.Now().Format("2006/01/02 15:04:05"), os.Getpid(), addr)
 	if err := http.ListenAndServe(addr, router); err != nil {
 		return err
 	}
 	return nil
 }
 
+func version(w http.ResponseWriter, r *http.Request) {
+	if r.Method != "GET" {
+		util.Response(w, 405, "Method Not Allowed")
+		return
+	}
+	util.Response(w, 200, config.Version)
+}
+
 func pong(w http.ResponseWriter, r *http.Request) {
 	if r.Method != "GET" {
 		util.Response(w, 405, "Method Not Allowed")
@@ -54,12 +62,15 @@ func webHookLog(conf config.Config) http.HandlerFunc {
 			payload.CommitName, payload.CommitEmail, payload.BranchName, payload.CommitID, payload.CommitAt)
 		log.Printf("script filename:%s\n", conf.ScriptBash)
 		// All is good (return an error to fail)
-		str, err := util.CallScript(conf.ScriptBash)
-		if err != nil {
-			log.Println(err)
-			return err
-		}
-		log.Println(str)
+		internal.NewBackend(true).Add(func() {
+			str, err := util.CallScript(conf.ScriptBash)
+			if err != nil {
+				fmt.Println("backend-err:", err)
+				return
+			}
+			fmt.Println("backend-result:", str)
+		})
+		fmt.Println("exec end")
 		return nil
 	})
 }