lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-26 20:16:55 -05:00
Code Issues Releases Wiki Activity

fix error usage

Browse Source
This commit is contained in:
Darien Raymond 2018-01-18 11:35:04 +01:00
parent fbfbbb8841
commit 14176a340d
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
proxy/vmess/account.go
View File

@ -31,8 +31,7 @@ func (a *InternalAccount) Equals(account protocol.Account) bool {
func (a *Account) AsAccount() (protocol.Account, error) { func (a *Account) AsAccount() (protocol.Account, error) {
id, err := uuid.ParseString(a.Id) id, err := uuid.ParseString(a.Id)
if err != nil { if err != nil {
newError("failed to parse ID").Base(err).AtError().WriteToLog() return nil, newError("failed to parse ID").Base(err).AtError()
return nil, err
} }
protoID := protocol.NewID(id) protoID := protocol.NewID(id)
return &InternalAccount{ return &InternalAccount{

4
proxy/vmess/inbound/inbound.go
View File

@ -185,7 +185,7 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection i
Status: log.AccessRejected, Status: log.AccessRejected,
Reason: err, Reason: err,
}) })
newError("invalid request from ", connection.RemoteAddr(), ": ", err).AtInfo().WriteToLog() err = newError("invalid request from ", connection.RemoteAddr()).Base(err).AtInfo()
} }
return err return err
} }
@ -252,7 +252,7 @@ func (h *Handler) generateCommand(ctx context.Context, request *protocol.Request
if h.inboundHandlerManager != nil { if h.inboundHandlerManager != nil {
handler, err := h.inboundHandlerManager.GetHandler(ctx, tag) handler, err := h.inboundHandlerManager.GetHandler(ctx, tag)
if err != nil { if err != nil {
newError("failed to get detour handler: ", tag, err).AtWarning().WriteToLog() newError("failed to get detour handler: ", tag).Base(err).AtWarning().WriteToLog()
return nil return nil
} }
proxyHandler, port, availableMin := handler.GetRandomInboundProxy() proxyHandler, port, availableMin := handler.GetRandomInboundProxy()