Browse Source

fix concurrent access crash for handler creator (#772)

Co-authored-by: Shelikhoo <xiaokangwang@outlook.com>
pull/779/head
yuhan6665 3 years ago committed by GitHub
parent
commit
76a3f24169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      app/log/log_creator.go

10
app/log/log_creator.go

@ -1,6 +1,8 @@
package log
import (
"sync"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/log"
)
@ -13,16 +15,24 @@ type HandlerCreator func(LogType, HandlerCreatorOptions) (log.Handler, error)
var handlerCreatorMap = make(map[LogType]HandlerCreator)
var handlerCreatorMapLock = &sync.RWMutex{}
func RegisterHandlerCreator(logType LogType, f HandlerCreator) error {
if f == nil {
return newError("nil HandlerCreator")
}
handlerCreatorMapLock.Lock()
defer handlerCreatorMapLock.Unlock()
handlerCreatorMap[logType] = f
return nil
}
func createHandler(logType LogType, options HandlerCreatorOptions) (log.Handler, error) {
handlerCreatorMapLock.RLock()
defer handlerCreatorMapLock.RUnlock()
creator, found := handlerCreatorMap[logType]
if !found {
return nil, newError("unable to create log handler for ", logType)

Loading…
Cancel
Save