del test mode

ads_handler.go

@@ -171,10 +171,6 @@ func adsHandler(c *gin.Context) {
 		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_FREQ_1", cityCode)
 	}
 
-	if adslib.GetConf().TestMode {
-		needControl = false
-	}
-
 	//### 检查是否是ip黑名单
 	isIpBlack, err := ads_checker.CheckBlackIp(ip)
 	if err != nil {

adslib/config.go

@@ -26,7 +26,6 @@ type SvrConf struct {
 	LogPath            string                                `toml:"log_path"`
 	RedisHost          string                                `toml:"redis_host"`
 	RedisPassword      string                                `toml:"redis_password"`
-	TestMode           bool                                  `toml:"test_mode"`
 }
 type FlogControlItem struct {
 	Percent  int `toml:"percent"`

adslib/device/device.go

@@ -6,7 +6,6 @@ import (
 	"github.com/gomodule/redigo/redis"
 	log "github.com/sirupsen/logrus"
 	"math/rand"
-	"miads/adslib"
 	"miads/adslib/ads_redis"
 	"strconv"
 	"strings"
@@ -25,10 +24,6 @@ func SetAdsTagLog(adv string, reqSource string, key string, cityCode int) {
 }
 
 func setTagLog(key string) {
-	if adslib.GetConf().TestMode {
-		return
-	}
-
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -40,10 +35,6 @@ func setTagLog(key string) {
 
 // 存储ip上一次请求时间
 func SetIpReqTime(ip string, reqTime int64) {
-	if adslib.GetConf().TestMode {
-		return
-	}
-
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -71,10 +62,6 @@ func GetIpReqTime(ip string) (int64, error) {
 }
 
 func SetMiDeviceConf(key string, d DeviceConf) error {
-	if adslib.GetConf().TestMode {
-		return nil
-	}
-
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -123,10 +110,6 @@ func GetMiDeviceConf(ip string, randNum int, specialDeviceNum int) (*DeviceConf,
 
 // 设置每天的city_code的值
 func SetDailyFakeDeviceConfByCityCode(cityCode int, d DeviceConf, dateInt int) error {
-	if adslib.GetConf().TestMode {
-		return nil
-	}
-
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 

adslib/graylog/graylog.go

@@ -8,6 +8,8 @@ import (
 	"miads/adslib/utils"
 	"net/url"
 	"time"
+
+	log "github.com/sirupsen/logrus"
 )
 
 var grayLog *gelf.Gelf
@@ -22,14 +24,10 @@ func init() {
 	})
 }
 
-func Log(log interface{}) {
-	logStr, _ := json.Marshal(log)
-	fmt.Printf("graylog: %s\n", logStr)
+func Log(logData interface{}) {
+	logStr, _ := json.Marshal(logData)
+	log.Infof("graylog: %s", logStr)
 	grayLog.Log(string(logStr))
-
-	if adslib.GetConf().TestMode {
-		return
-	}
 }
 
 func LogApi(shortMsg string, desc string, extraDesc string, reqSource string) {

adslib/redis_data/redis_data.go

@@ -162,10 +162,6 @@ func GetFlowPercentDuration(advertiser string, action string) *adslib.FlogContro
 
 // 设置回调回来的广告动作的次数
 func SetDistributeActionNum(advertiser string, action string, bannerid int) {
-	if adslib.GetConf().TestMode {
-		return
-	}
-
 	if advertiser == "" {
 		return
 	}
@@ -204,9 +200,6 @@ func GetDeviceIpReport(deviceId string, ip string) (bool, error) {
 
 // 设置设备+ip上报的时间点
 func SetDeviceIpReport(deviceid string, ip string) {
-	if adslib.GetConf().TestMode {
-		return
-	}
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -216,9 +209,6 @@ func SetDeviceIpReport(deviceid string, ip string) {
 
 // 设置总请求到广告的次数
 func SetAdsRequestNum(advertiser string, bannerId int) {
-	if adslib.GetConf().TestMode {
-		return
-	}
 	if advertiser == "" {
 		return
 	}
@@ -234,9 +224,6 @@ func SetAdsRequestNum(advertiser string, bannerId int) {
 }
 
 func SetAdsRealRequestNum(advertiser string) {
-	if adslib.GetConf().TestMode {
-		return
-	}
 	if advertiser == "" {
 		return
 	}
@@ -277,9 +264,6 @@ func GetMinScriptOrderByAdv(advertiser string) (int64, error) {
 
 // 设置来源的曝光次数
 func SetReqSourceView(adv string, reqSource string, source string) {
-	if adslib.GetConf().TestMode {
-		return
-	}
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -329,10 +313,6 @@ func GetFinishedDispatchCount(orderId int64, dispatchType string, curTime time.T
 // 增加已经投放的量
 // dispatchType: "click", "show"
 func IncrFinishedDispatchCount(orderId int64, dispatchType string, incrCnt int, curTime time.Time) (int, error) {
-	if adslib.GetConf().TestMode {
-		return 0, nil
-	}
-
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -371,10 +351,6 @@ func GetPreMinuteFinishedDispatchCount(orderId int64, dispatchType string, curTi
 // 增加当前分钟已经投放的量
 // dispatchType: "click", "show"
 func IncrPreMinuteFinishedDispatchCount(orderId int64, dispatchType string, incrCnt int, curTime time.Time) (int, error) {
-	if adslib.GetConf().TestMode {
-		return 0, nil
-	}
-
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -391,9 +367,6 @@ func IncrPreMinuteFinishedDispatchCount(orderId int64, dispatchType string, incr
 // 设置总计划投放数量
 // dispatchType: "click", "show"
 func SetPlanDispatchCount(orderId int64, dispatchType string, cnt int, curTime time.Time) {
-	if adslib.GetConf().TestMode {
-		return
-	}
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
@@ -404,9 +377,6 @@ func SetPlanDispatchCount(orderId int64, dispatchType string, cnt int, curTime t
 // 设置订单计划投放数量
 // dispatchType: "click", "show"
 func SetOrderPlanDispatchCount(orderId int64, dispatchType string, cnt int, curTime time.Time) {
-	if adslib.GetConf().TestMode {
-		return
-	}
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()