修复崩溃

ads_handler.go

@@ -146,10 +146,12 @@ func adsHandler(c *gin.Context) {
 		}
 
 		log.WithField("request_id", dspInfo.RequestId).Infof("freq control conf: %+v", freqControlConf)
-		hour, _ := strconv.Atoi(time.Now().Format("01"))
-		tmpControlInterval, ok := freqControlConf.GetControlTime(hour)
-		if ok {
-			freqControlInterval = tmpControlInterval
+		if freqControlConf != nil {
+			hour, _ := strconv.Atoi(time.Now().Format("01"))
+			tmpControlInterval, ok := freqControlConf.GetControlTime(hour)
+			if ok {
+				freqControlInterval = tmpControlInterval
+			}
 		}
 	}
 
@@ -189,6 +191,7 @@ func adsHandler(c *gin.Context) {
 		c.String(404, "get req channel flag failed: %s", err)
 		return
 	}
+
 	flowWeight := reqChannelFlag.Weigth
 	flowRandomNum := rand.Intn(100)
 

adslib/ip2region/ip2region.go

@@ -3,10 +3,11 @@ package ip2region
 import (
 	"fmt"
 	"github.com/lionsoul2014/ip2region/binding/golang/ip2region"
+	"miads/adslib"
 )
 
 func Ip2Region(ip string) (*ip2region.IpInfo, error) {
-	region, err := ip2region.New("./conf/ip2region_20200113.db")
+	region, err := ip2region.New(adslib.GetConf().Ip2RegionFile)
 	if region != nil {
 		defer region.Close()
 	}

main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"github.com/gin-gonic/gin"
 	rotatelogs "github.com/lestrrat-go/file-rotatelogs"
 	"io"
@@ -51,10 +50,10 @@ func main() {
 	adslib.GetConf()
 	setupLogger(adslib.GetConf().LogPath+"/ads.log", log.TraceLevel)
 
-	if ads_redis.RedisConn.ActiveCount() == 0 {
-		fmt.Printf("setup redis failed, no active redis")
-		return
-	}
+	//if ads_redis.RedisConn.ActiveCount() == 0 {
+	//	fmt.Printf("setup redis failed, no active redis")
+	//	return
+	//}
 
 	r := setupRouter()
 	endless.ListenAndServe(":8080", r)

makefile

@@ -1,4 +1,6 @@
-miads:*.go
+.PHONY:miads
+
+miads:
 	go build .
 
 clean: