调整配置

ads_handler.go

@@ -59,7 +59,7 @@ func setupLogger(logName string, logLevel log.Level) {
 }
 
 func adsHandler(c *gin.Context) {
-	setupLogger("log/ads.log", log.TraceLevel)
+	setupLogger(adslib.GetConf().LogPath+"/ads.log", log.TraceLevel)
 	c.Header("Content-Type", "application/json")
 
 	request := adslib.Request{}

adslib/config.go

@@ -22,6 +22,8 @@ type SvrConf struct {
 	ActionWeight       ActionWeight                          `toml:"action_weight"`
 	CombinationActions map[string][]CombinationActionsConf   `toml:"combination_actions"`
 	SecretKey          string                                `toml:"secret_key"`
+	Ip2RegionFile      string                                `toml:"ip2region_file"`
+	LogPath            string                                `toml:"log_path"`
 }
 type FlogControlItem struct {
 	Percent  int `toml:"percent"`
@@ -46,7 +48,7 @@ var svrConf SvrConf
 var once sync.Once
 
 func GetConf() *SvrConf {
-	once.Do(func () {
+	once.Do(func() {
 		_, err := toml.DecodeFile("./conf/config.toml", &svrConf)
 		if err != nil {
 			panic(err)

adslib/ip2region/ip2region_test.go

@@ -3,13 +3,15 @@ package ip2region
 import (
 	"fmt"
 	"github.com/lionsoul2014/ip2region/binding/golang/ip2region"
+	"miads/adslib"
 	"testing"
 )
 
 var r *ip2region.Ip2Region
+
 func init() {
 	var err error
-	r, err = ip2region.New("../../conf/ip2region.db")
+	r, err = ip2region.New(adslib.GetConf().Ip2RegionFile)
 	if err != nil {
 		fmt.Printf("%s", err)
 	}