[build test]

config/config.go

@@ -41,7 +41,8 @@ type General struct {
 	LogLevel      log.LogLevel `json:"log-level"`
 	IPv6          bool         `json:"ipv6"`
 	Interface     string       `json:"-"`
-	GeodataMode   string       `json:"geodata-mode"`
+	RoutingMark   int          `json:"-"`
+	GeodataMode   bool         `json:"geodata-mode"`
 	GeodataLoader string       `json:"geodata-loader"`
 	AutoIptables  bool         `json:"auto-iptables"`
 }
@@ -173,10 +174,10 @@ type RawConfig struct {
 	ExternalUI         string       `yaml:"external-ui"`
 	Secret             string       `yaml:"secret"`
 	Interface          string       `yaml:"interface-name"`
-	GeodataMode        string       `yaml:"geodata-mode"`
+	RoutingMark        int          `yaml:"routing-mark"`
+	GeodataMode        bool         `yaml:"geodata-mode"`
 	GeodataLoader      string       `yaml:"geodata-loader"`
 	AutoIptables       bool         `yaml:"auto-iptables"`
-	RoutingMark        int          `yaml:"routing-mark"`
 
 	ProxyProvider map[string]map[string]interface{} `yaml:"proxy-providers"`
 	RuleProvider  map[string]map[string]interface{} `yaml:"rule-providers"`
@@ -207,7 +208,7 @@ func UnmarshalRawConfig(buf []byte) (*RawConfig, error) {
 		AllowLan:       false,
 		BindAddress:    "*",
 		Mode:           T.Rule,
-		GeodataMode:    "dat",
+		GeodataMode:    GeodataMode,
 		GeodataLoader:  "memconservative",
 		AutoIptables:   false,
 		UnifiedDelay:   false,
@@ -350,9 +351,10 @@ func parseGeneral(cfg *RawConfig) (*General, error) {
 		LogLevel:      cfg.LogLevel,
 		IPv6:          cfg.IPv6,
 		Interface:     cfg.Interface,
+		RoutingMark:   cfg.RoutingMark,
+		GeodataMode:   cfg.GeodataMode,
 		GeodataLoader: cfg.GeodataLoader,
 		AutoIptables:  cfg.AutoIptables,
-		RoutingMark: cfg.RoutingMark,
 	}, nil
 }