github/v2ray-core
4
0
Fork 0
mirror of https://github.com/v2ray/v2ray-core.git synced 2026-11-01 08:17:25 +00:00
Code Issues Releases Wiki Activity

lazy evaluation of log fields

Browse Source
This commit is contained in:
v2ray
2016-01-18 12:24:33 +01:00
parent 8f20933457
commit eec0bb4db4
25 changed files with 124 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/router/config_json.go
+1 -1
View File
@@ -19,7 +19,7 @@ func (this *Config) UnmarshalJSON(data []byte) error {
}
settings, err := CreateRouterConfig(jsonConfig.Strategy, []byte(jsonConfig.Settings))
if err != nil {
log.Error("Router: Failed to load router settings: %v", err)
log.Error("Router: Failed to load router settings: ", err)
return err
}
this.Strategy = jsonConfig.Strategy
app/router/rules/chinaip.go
+1 -1
View File
@@ -13,7 +13,7 @@ func parseChinaIPRule(data []byte) (*Rule, error) {
rawRule := new(JsonRule)
err := json.Unmarshal(data, rawRule)
if err != nil {
log.Error("Router: Invalid router rule: %v", err)
log.Error("Router: Invalid router rule: ", err)
return nil, err
}
return &Rule{
app/router/rules/chinasites.go
+1 -1
View File
@@ -24,7 +24,7 @@ func parseChinaSitesRule(data []byte) (*Rule, error) {
rawRule := new(JsonRule)
err := json.Unmarshal(data, rawRule)
if err != nil {
log.Error("Router: Invalid router rule: %v", err)
log.Error("Router: Invalid router rule: ", err)
return nil, err
}
return &Rule{
app/router/rules/router_config.go
+6 -6
View File
@@ -53,7 +53,7 @@ func parseFieldRule(msg json.RawMessage) (*Rule, error) {
for _, ipStr := range *(rawFieldRule.IP) {
cidrMatcher, err := NewCIDRMatcher(ipStr.String())
if err != nil {
log.Error("Router: Invalid IP range in router rule: %v", err)
log.Error("Router: Invalid IP range in router rule: ", err)
return nil, err
}
conds.Add(cidrMatcher)
@@ -78,14 +78,14 @@ func parseRule(msg json.RawMessage) *Rule {
rawRule := new(JsonRule)
err := json.Unmarshal(msg, rawRule)
if err != nil {
log.Error("Router: Invalid router rule: %v", err)
log.Error("Router: Invalid router rule: ", err)
return nil
}
if rawRule.Type == "field" {
fieldrule, err := parseFieldRule(msg)
if err != nil {
log.Error("Invalid field rule: %v", err)
log.Error("Invalid field rule: ", err)
return nil
}
return fieldrule
@@ -93,7 +93,7 @@ func parseRule(msg json.RawMessage) *Rule {
if rawRule.Type == "chinaip" {
chinaiprule, err := parseChinaIPRule(msg)
if err != nil {
log.Error("Router: Invalid chinaip rule: %v", err)
log.Error("Router: Invalid chinaip rule: ", err)
return nil
}
return chinaiprule
@@ -101,12 +101,12 @@ func parseRule(msg json.RawMessage) *Rule {
if rawRule.Type == "chinasites" {
chinasitesrule, err := parseChinaSitesRule(msg)
if err != nil {
log.Error("Invalid chinasites rule: %v", err)
log.Error("Invalid chinasites rule: ", err)
return nil
}
return chinasitesrule
}
log.Error("Unknown router rule type: %s", rawRule.Type)
log.Error("Unknown router rule type: ", rawRule.Type)
return nil
}