|
@@ -251,7 +251,10 @@ func (e *ExtractTask) ExtractProcess(j *ju.Job) {
|
|
//函数清理
|
|
//函数清理
|
|
for key, val := range j.Result {
|
|
for key, val := range j.Result {
|
|
for _, v := range val {
|
|
for _, v := range val {
|
|
- data := clear.DoClearFn(e.ClearFn[key], []interface{}{v.Value, j.Content})
|
|
|
|
|
|
+ lock.Lock()
|
|
|
|
+ cfn := e.ClearFn[key]
|
|
|
|
+ lock.Unlock()
|
|
|
|
+ data := clear.DoClearFn(cfn, []interface{}{v.Value, j.Content})
|
|
v.Value = data[0]
|
|
v.Value = data[0]
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -330,7 +333,9 @@ func ExtRegCore(extfrom string, doc map[string]interface{}, j *ju.Job, in *RegLu
|
|
func getKvByLuaFields(extfrom string, j *ju.Job, in *RegLuaInfo, t map[string][]*Tag) map[string][]map[string]interface{} {
|
|
func getKvByLuaFields(extfrom string, j *ju.Job, in *RegLuaInfo, t map[string][]*Tag) map[string][]map[string]interface{} {
|
|
kvmap := map[string][]map[string]interface{}{}
|
|
kvmap := map[string][]map[string]interface{}{}
|
|
for fieldname, field := range in.LFields {
|
|
for fieldname, field := range in.LFields {
|
|
|
|
+ lock.Lock()
|
|
tags := t[field] //获取对应标签库
|
|
tags := t[field] //获取对应标签库
|
|
|
|
+ lock.Unlock()
|
|
for _, bl := range j.Block {
|
|
for _, bl := range j.Block {
|
|
//冒号kv
|
|
//冒号kv
|
|
if bl.ColonKV != nil {
|
|
if bl.ColonKV != nil {
|