mirror of
https://github.com/Monibuca/engine.git
synced 2025-10-06 00:56:58 +08:00
1.修复读取ts中aac格式数据多次flush问题
2.修复subscribe结束时判断IsClosed调用对象错误 3.增加DefaultYaml功能
This commit is contained in:
@@ -6,7 +6,6 @@ import (
|
||||
"reflect"
|
||||
"strings"
|
||||
|
||||
"go.uber.org/zap"
|
||||
"m7s.live/engine/v4/log"
|
||||
)
|
||||
|
||||
@@ -162,11 +161,11 @@ func (config Config) Merge(source Config) {
|
||||
case Config:
|
||||
m.Merge(v.(Config))
|
||||
default:
|
||||
log.Debug("merge", zap.String("k", k), zap.Any("v", v))
|
||||
log.Debug("merge", k, v)
|
||||
config[k] = v
|
||||
}
|
||||
} else {
|
||||
log.Debug("exist", zap.String("k", k))
|
||||
log.Debug("exist", k)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user