mirror of https://github.com/v2ray/v2ray-core
fix nil pointer on close().
parent
c277c6de54
commit
7078f23291
|
@ -11,6 +11,7 @@ import (
|
||||||
"v2ray.com/core/common/log"
|
"v2ray.com/core/common/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Instance is an app.Application that handles logs.
|
||||||
type Instance struct {
|
type Instance struct {
|
||||||
sync.RWMutex
|
sync.RWMutex
|
||||||
config *Config
|
config *Config
|
||||||
|
@ -18,12 +19,14 @@ type Instance struct {
|
||||||
errorLogger internal.LogWriter
|
errorLogger internal.LogWriter
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// New creates a new log.Instance based on the given config.
|
||||||
func New(ctx context.Context, config *Config) (*Instance, error) {
|
func New(ctx context.Context, config *Config) (*Instance, error) {
|
||||||
return &Instance{
|
return &Instance{
|
||||||
config: config,
|
config: config,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Interface implements app.Application.Interface().
|
||||||
func (*Instance) Interface() interface{} {
|
func (*Instance) Interface() interface{} {
|
||||||
return (*Instance)(nil)
|
return (*Instance)(nil)
|
||||||
}
|
}
|
||||||
|
@ -58,6 +61,7 @@ func (g *Instance) initErrorLogger() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Start implements app.Application.Start().
|
||||||
func (g *Instance) Start() error {
|
func (g *Instance) Start() error {
|
||||||
if err := g.initAccessLogger(); err != nil {
|
if err := g.initAccessLogger(); err != nil {
|
||||||
return newError("failed to initialize access logger").Base(err).AtWarning()
|
return newError("failed to initialize access logger").Base(err).AtWarning()
|
||||||
|
@ -69,6 +73,7 @@ func (g *Instance) Start() error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Handle implements log.Handler.
|
||||||
func (g *Instance) Handle(msg log.Message) {
|
func (g *Instance) Handle(msg log.Message) {
|
||||||
switch msg := msg.(type) {
|
switch msg := msg.(type) {
|
||||||
case *log.AccessMessage:
|
case *log.AccessMessage:
|
||||||
|
@ -90,15 +95,20 @@ func (g *Instance) Handle(msg log.Message) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Close implement app.Application.Close().
|
||||||
func (g *Instance) Close() {
|
func (g *Instance) Close() {
|
||||||
g.Lock()
|
g.Lock()
|
||||||
defer g.Unlock()
|
defer g.Unlock()
|
||||||
|
|
||||||
g.accessLogger.Close()
|
if g.accessLogger != nil {
|
||||||
g.accessLogger = nil
|
g.accessLogger.Close()
|
||||||
|
g.accessLogger = nil
|
||||||
|
}
|
||||||
|
|
||||||
g.errorLogger.Close()
|
if g.errorLogger != nil {
|
||||||
g.errorLogger = nil
|
g.errorLogger.Close()
|
||||||
|
g.errorLogger = nil
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|
Loading…
Reference in New Issue