uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-13 19:56:38 +05:00
Code Issues Packages Projects Releases Wiki Activity

Rename utils.MetaPrefix -> utils.Meta to avoid confusion with *pretix

Browse Source
This commit is contained in:
TeoV
2018-02-07 11:43:48 +02:00
committed by Dan Christian Bogos
parent b758adb154
commit 8d2845dfcd
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/datamanager.go
View File

@@ -432,7 +432,7 @@ func (dm *DataManager) SetThresholdProfile(th *ThresholdProfile, withIndex bool)
},
},
}
} else if strings.HasPrefix(fltrID, utils.MetaPrefix) {
} else if strings.HasPrefix(fltrID, utils.Meta) {
inFltr, err := NewInlineFilter(fltrID)
if err != nil {
return err
@@ -538,7 +538,7 @@ func (dm *DataManager) SetStatQueueProfile(sqp *StatQueueProfile, withIndex bool
},
},
}
} else if strings.HasPrefix(fltrID, utils.MetaPrefix) {
} else if strings.HasPrefix(fltrID, utils.Meta) {
inFltr, err := NewInlineFilter(fltrID)
if err != nil {
return err
@@ -720,7 +720,7 @@ func (dm *DataManager) SetResourceProfile(rp *ResourceProfile, withIndex bool) (
},
},
}
} else if strings.HasPrefix(fltrID, utils.MetaPrefix) {
} else if strings.HasPrefix(fltrID, utils.Meta) {
inFltr, err := NewInlineFilter(fltrID)
if err != nil {
return err
@@ -1184,7 +1184,7 @@ func (dm *DataManager) SetSupplierProfile(supp *SupplierProfile, withIndex bool)
},
},
}
} else if strings.HasPrefix(fltrID, utils.MetaPrefix) {
} else if strings.HasPrefix(fltrID, utils.Meta) {
inFltr, err := NewInlineFilter(fltrID)
if err != nil {
return err
@@ -1322,7 +1322,7 @@ func (dm *DataManager) SetAttributeProfile(ap *AttributeProfile, withIndex bool)
},
},
}
} else if strings.HasPrefix(fltrID, utils.MetaPrefix) {
} else if strings.HasPrefix(fltrID, utils.Meta) {
inFltr, err := NewInlineFilter(fltrID)
if err != nil {
return err

4
engine/filters.go
View File

@@ -109,7 +109,7 @@ func (fS *FilterS) PassFiltersForEvent(tenant string, ev map[string]interface{},
}
for _, fltrID := range filterIDs {
var f *Filter
if strings.HasPrefix(fltrID, utils.MetaPrefix) {
if strings.HasPrefix(fltrID, utils.Meta) {
inFtr, err := NewInlineFilter(fltrID)
if err != nil {
return false, err
@@ -347,7 +347,7 @@ func (fltr *FilterRule) passStatS(req interface{}, extraFieldsLabel string, stat
if err := stats.Call("StatSV1.GetFloatMetrics", threshold.QueueID, &statValues); err != nil {
return false, err
}
val, hasIt := statValues[utils.MetaPrefix+threshold.ThresholdType[len(MetaMinCapPrefix):]]
val, hasIt := statValues[utils.Meta+threshold.ThresholdType[len(MetaMinCapPrefix):]]
if !hasIt {
continue
}

10
engine/tp_reader.go
View File

@@ -1655,7 +1655,7 @@ func (tpr *TpReader) LoadResourceProfilesFiltered(tag string) (err error) {
},
}
tpr.resIndexers[tntID.Tenant].IndexTPFilter(tpFltr, res.ID)
} else if strings.HasPrefix(fltrID, utils.MetaPrefix) {
} else if strings.HasPrefix(fltrID, utils.Meta) {
inFltr, err := NewInlineFilter(fltrID)
if err != nil {
return err
@@ -1734,7 +1734,7 @@ func (tpr *TpReader) LoadStatsFiltered(tag string) (err error) {
},
}
tpr.sqpIndexers[tntID.Tenant].IndexTPFilter(tpFltr, sq.ID)
} else if strings.HasPrefix(fltrID, utils.MetaPrefix) {
} else if strings.HasPrefix(fltrID, utils.Meta) {
inFltr, err := NewInlineFilter(fltrID)
if err != nil {
return err
@@ -1813,7 +1813,7 @@ func (tpr *TpReader) LoadThresholdsFiltered(tag string) (err error) {
},
}
tpr.thdsIndexers[tntID.Tenant].IndexTPFilter(tpFltr, th.ID)
} else if strings.HasPrefix(fltrID, utils.MetaPrefix) {
} else if strings.HasPrefix(fltrID, utils.Meta) {
inFltr, err := NewInlineFilter(fltrID)
if err != nil {
return err
@@ -1909,7 +1909,7 @@ func (tpr *TpReader) LoadSupplierProfilesFiltered(tag string) (err error) {
},
}
tpr.sppIndexers[tntID.Tenant].IndexTPFilter(tpFltr, sup.ID)
} else if strings.HasPrefix(fltrID, utils.MetaPrefix) {
} else if strings.HasPrefix(fltrID, utils.Meta) {
inFltr, err := NewInlineFilter(fltrID)
if err != nil {
return err
@@ -1990,7 +1990,7 @@ func (tpr *TpReader) LoadAttributeProfilesFiltered(tag string) (err error) {
},
}
tpr.attrIndexers[tntID.Tenant].IndexTPFilter(tpFltr, attrP.ID)
} else if strings.HasPrefix(fltrID, utils.MetaPrefix) {
} else if strings.HasPrefix(fltrID, utils.Meta) {
inFltr, err := NewInlineFilter(fltrID)
if err != nil {
return err

2
utils/consts.go
View File

@@ -415,7 +415,7 @@ const (
RALService = "RALs"
CostSource = "CostSource"
ExtraInfo = "ExtraInfo"
MetaPrefix = "*"
Meta = "*"
EventResourcesPrefix = "ers_"
MetaSysLog = "*syslog"
MetaStdLog = "*stdout"