支持热重启

ads_handler.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
-	"io"
 	"math/rand"
 	"miads/adslib"
 	"miads/adslib/addata"
@@ -17,12 +16,10 @@ import (
 	"miads/adslib/redis_data"
 	"miads/adslib/utils"
 	"net/url"
-	"os"
 	"strconv"
 	"strings"
 	"time"
 
-	"github.com/lestrrat-go/file-rotatelogs"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -33,33 +30,7 @@ type Response struct {
 	addata.AdData
 }
 
-func setupLogger(logName string, logLevel log.Level) {
-	writer, err := rotatelogs.New(
-		logName+".%Y%m%d",
-
-		// WithLinkName为最新的日志建立软连接，以方便随着找到当前日志文件
-		rotatelogs.WithLinkName(logName),
-
-		// WithRotationTime设置日志分割的时间，这里设置为一小时分割一次
-		rotatelogs.WithRotationTime(time.Hour),
-
-		// WithMaxAge和WithRotationCount二者只能设置一个，
-		// WithMaxAge设置文件清理前的最长保存时间，
-		// WithRotationCount设置文件清理前最多保存的个数。
-		rotatelogs.WithMaxAge(time.Hour*24*3),
-	)
-
-	if err != nil {
-		log.Errorf("config local file system for logger error: %v", err)
-	}
-
-	log.SetReportCaller(true)
-	log.SetLevel(logLevel)
-	log.SetOutput(io.MultiWriter(writer, os.Stdout))
-}
-
 func adsHandler(c *gin.Context) {
-	setupLogger(adslib.GetConf().LogPath+"/ads.log", log.TraceLevel)
 	c.Header("Content-Type", "application/json")
 
 	request := adslib.Request{}

main.go

@@ -1,23 +1,59 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
+	"io"
 	"miads/adslib"
 	"miads/adslib/ads_redis"
+	"net/http"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+
+	"github.com/fvbock/endless"
+	log "github.com/sirupsen/logrus"
 )
 
+func setupLogger(logName string, logLevel log.Level) {
+	writer, err := rotatelogs.New(
+		logName+".%Y%m%d",
+
+		// WithLinkName为最新的日志建立软连接，以方便随着找到当前日志文件
+		rotatelogs.WithLinkName(logName),
+
+		// WithRotationTime设置日志分割的时间，这里设置为一小时分割一次
+		rotatelogs.WithRotationTime(time.Hour),
+
+		// WithMaxAge和WithRotationCount二者只能设置一个，
+		// WithMaxAge设置文件清理前的最长保存时间，
+		// WithRotationCount设置文件清理前最多保存的个数。
+		rotatelogs.WithMaxAge(time.Hour*24*3),
+	)
+
+	if err != nil {
+		log.Errorf("config local file system for logger error: %v", err)
+	}
+
+	log.SetReportCaller(true)
+	log.SetLevel(logLevel)
+	log.SetOutput(io.MultiWriter(writer, os.Stdout))
+}
+
 func setupRouter() *gin.Engine {
 	r := gin.Default()
 
 	r.POST("/ads", adsHandler)
-	r.GET("/ads", adsHandler)
 	return r
 }
 
 func main() {
 	ads_redis.Setup()
 	adslib.GetConf()
+	setupLogger(adslib.GetConf().LogPath+"/ads.log", log.TraceLevel)
 
 	if ads_redis.RedisConn.ActiveCount() == 0 {
 		fmt.Printf("setup redis failed, no active redis")
@@ -25,6 +61,5 @@ func main() {
 	}
 
 	r := setupRouter()
-	// Listen and Server in 0.0.0.0:8080
-	r.Run(":8080")
-}
+	endless.ListenAndServe(":8080", r)
+}