调整redis

ads_handler.go

@@ -138,7 +138,7 @@ func adsHandler(c *gin.Context) {
 	// 深圳，东莞强行用600秒控制, 其他地区从配置读取
 	if strings.Index(ipInfo.City, "深圳") == -1 && strings.Index(ipInfo.City, "东莞") == -1 {
 		// 频率控制
-		freqControlConf, err := redis_data.GetFreqCrontolConf(request.ReqSource)
+		freqControlConf, err := redis_data.GetFreqControlConf(request.ReqSource)
 		if err != nil {
 			log.WithField("request_id", dspInfo.RequestId).Errorf("get freq control conf failed: %s", err)
 			c.String(404, "get freq control conf failed: %s", err)

adslib/redis_data/redis_data.go

@@ -36,18 +36,18 @@ func (self *FreqControlConf) GetControlTime(hour int) (int, bool) {
 }
 
 // 获取渠道的标记
-func GetChannelFlag(reqSource string, business string) (*ChannelFlag, error) {
+func GetChannelFlag(reqSource string, business string) (ChannelFlag, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
 	redisKey := fmt.Sprintf("acfv2_%s_%s", reqSource, business)
 	rsp, err := conn.Do("GET", redisKey)
 	if err != nil {
-		return nil, err
+		return ChannelFlag{}, err
 	}
 
 	if rsp == nil {
-		return nil, nil
+		return ChannelFlag{}, nil
 	}
 
 	rspBytes, _ := redis.Bytes(rsp, err)
@@ -55,14 +55,14 @@ func GetChannelFlag(reqSource string, business string) (*ChannelFlag, error) {
 	channelFlag := ChannelFlag{}
 	err = json.Unmarshal(rspBytes, &channelFlag)
 	if err != nil {
-		return nil, err
+		return ChannelFlag{}, err
 	}
 
-	return &channelFlag, nil
+	return channelFlag, nil
 }
 
 // 获取渠道频率信息
-func GetFreqCrontolConf(reqSource string) (*FreqControlConf, error) {
+func GetFreqControlConf(reqSource string) (FreqControlConf, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -70,11 +70,11 @@ func GetFreqCrontolConf(reqSource string) (*FreqControlConf, error) {
 
 	rsp, err := conn.Do("GET", redisKey)
 	if err != nil {
-		return nil, err
+		return FreqControlConf{}, err
 	}
 
 	if rsp == nil {
-		return nil, nil
+		return FreqControlConf{}, nil
 	}
 
 	rspBytes, _ := redis.Bytes(rsp, err)
@@ -82,10 +82,10 @@ func GetFreqCrontolConf(reqSource string) (*FreqControlConf, error) {
 	f := FreqControlConf{}
 	err = json.Unmarshal(rspBytes, &f.confs)
 	if err != nil {
-		return nil, err
+		return FreqControlConf{}, err
 	}
 
-	return &f, nil
+	return f, nil
 }
 
 // 获取该广告的总请求次数

main.go

@@ -50,11 +50,6 @@ 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
-	//}
-
 	r := setupRouter()
 	endless.ListenAndServe(":8080", r)
 }