github-forks
/
naza
mirror of https://github.com/q191201771/naza
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename package log -> package nazalog

Browse Source
pull/2/head
q191201771 5 years ago
parent db8122c69d
commit 94cbffe32a
8 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File

38
pkg/connection/connection.go
Unescape Escape View File

@ -8,7 +8,7 @@ package connection
import ( import (
"bufio" "bufio"
"errors" "errors"
"github.com/q191201771/nezha/pkg/log" "github.com/q191201771/nezha/pkg/nazalog"
"io" "io"
"net" "net"
"sync" "sync"
@ -170,13 +170,13 @@ func (c *connection) ReadAtLeast(buf []byte, min int) (n int, err error) {
if c.option.ReadTimeoutMS > 0 { if c.option.ReadTimeoutMS > 0 {
err = c.SetReadDeadline(time.Now().Add(time.Duration(c.option.ReadTimeoutMS) * time.Millisecond)) err = c.SetReadDeadline(time.Now().Add(time.Duration(c.option.ReadTimeoutMS) * time.Millisecond))
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
return 0, err return 0, err
} }
} }
n, err = io.ReadAtLeast(c.r, buf, min) n, err = io.ReadAtLeast(c.r, buf, min)
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
c.close(err) c.close(err)
} }
return n, err return n, err
@ -192,13 +192,13 @@ func (c *connection) ReadLine() (line []byte, isPrefix bool, err error) {
if c.option.ReadTimeoutMS > 0 { if c.option.ReadTimeoutMS > 0 {
err = c.SetReadDeadline(time.Now().Add(time.Duration(c.option.ReadTimeoutMS) * time.Millisecond)) err = c.SetReadDeadline(time.Now().Add(time.Duration(c.option.ReadTimeoutMS) * time.Millisecond))
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
return nil, false, err return nil, false, err
} }
} }
line, isPrefix, err = bufioReader.ReadLine() line, isPrefix, err = bufioReader.ReadLine()
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
c.close(err) c.close(err)
} }
return line, isPrefix, err return line, isPrefix, err
@ -208,13 +208,13 @@ func (c *connection) Read(b []byte) (n int, err error) {
if c.option.ReadTimeoutMS > 0 { if c.option.ReadTimeoutMS > 0 {
err = c.SetReadDeadline(time.Now().Add(time.Duration(c.option.ReadTimeoutMS) * time.Millisecond)) err = c.SetReadDeadline(time.Now().Add(time.Duration(c.option.ReadTimeoutMS) * time.Millisecond))
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
return 0, err return 0, err
} }
} }
n, err = c.r.Read(b) n, err = c.r.Read(b)
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
c.close(err) c.close(err)
} }
return n, err return n, err
@ -232,13 +232,13 @@ func (c *connection) write(b []byte) (n int, err error) {
if c.option.WriteTimeoutMS > 0 { if c.option.WriteTimeoutMS > 0 {
err = c.SetWriteDeadline(time.Now().Add(time.Duration(c.option.WriteTimeoutMS) * time.Millisecond)) err = c.SetWriteDeadline(time.Now().Add(time.Duration(c.option.WriteTimeoutMS) * time.Millisecond))
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
return 0, err return 0, err
} }
} }
n, err = c.w.Write(b) n, err = c.w.Write(b)
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
c.close(err) c.close(err)
} }
return n, err return n, err
@ -248,18 +248,18 @@ func (c *connection) runWriteLoop() {
for { for {
select { select {
case <-c.exitChan: case <-c.exitChan:
log.Debug("exitChan recv, exit write loop.") nazalog.Debug("exitChan recv, exit write loop.")
return return
case msg := <-c.wChan: case msg := <-c.wChan:
switch msg.t { switch msg.t {
case wMsgTWrite: case wMsgTWrite:
if _, err := c.write(msg.b); err != nil { if _, err := c.write(msg.b); err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
return return
} }
case wMsgTFlush: case wMsgTFlush:
if err := c.flush(); err != nil { if err := c.flush(); err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
c.flushDoneChan <- struct{}{} c.flushDoneChan <- struct{}{}
return return
} }
@ -285,12 +285,12 @@ func (c *connection) flush() error {
if c.option.WriteTimeoutMS > 0 { if c.option.WriteTimeoutMS > 0 {
err := c.SetWriteDeadline(time.Now().Add(time.Duration(c.option.WriteTimeoutMS) * time.Millisecond)) err := c.SetWriteDeadline(time.Now().Add(time.Duration(c.option.WriteTimeoutMS) * time.Millisecond))
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
return err return err
} }
} }
if err := w.Flush(); err != nil { if err := w.Flush(); err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
c.close(err) c.close(err)
return err return err
} }
@ -299,13 +299,13 @@ func (c *connection) flush() error {
} }
func (c *connection) Close() error { func (c *connection) Close() error {
log.Debugf("nezha connection Close. conn=%p", c) nazalog.Debugf("nezha connection Close. conn=%p", c)
c.close(nil) c.close(nil)
return nil return nil
} }
func (c *connection) close(err error) { func (c *connection) close(err error) {
log.Debugf("nezha connection close. err=%v, conn=%p", err, c) nazalog.Debugf("nezha connection close. err=%v, conn=%p", err, c)
c.closeOnce.Do(func() { c.closeOnce.Do(func() {
if c.option.WriteChanSize > 0 { if c.option.WriteChanSize > 0 {
c.exitChan <- struct{}{} c.exitChan <- struct{}{}
@ -330,7 +330,7 @@ func (c *connection) RemoteAddr() net.Addr {
func (c *connection) SetDeadline(t time.Time) error { func (c *connection) SetDeadline(t time.Time) error {
err := c.Conn.SetDeadline(t) err := c.Conn.SetDeadline(t)
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
c.close(err) c.close(err)
} }
return err return err
@ -339,7 +339,7 @@ func (c *connection) SetDeadline(t time.Time) error {
func (c *connection) SetReadDeadline(t time.Time) error { func (c *connection) SetReadDeadline(t time.Time) error {
err := c.Conn.SetReadDeadline(t) err := c.Conn.SetReadDeadline(t)
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
c.close(err) c.close(err)
} }
return err return err
@ -348,7 +348,7 @@ func (c *connection) SetReadDeadline(t time.Time) error {
func (c *connection) SetWriteDeadline(t time.Time) error { func (c *connection) SetWriteDeadline(t time.Time) error {
err := c.Conn.SetWriteDeadline(t) err := c.Conn.SetWriteDeadline(t)
if err != nil { if err != nil {
log.Debugf("nezha connection. error=%v, conn=%p", err, c) nazalog.Debugf("nezha connection. error=%v, conn=%p", err, c)
c.close(err) c.close(err)
} }
return err return err

4
pkg/connection/connection_test.go
Unescape Escape View File

@ -2,7 +2,7 @@ package connection
import ( import (
"github.com/q191201771/nezha/pkg/assert" "github.com/q191201771/nezha/pkg/assert"
"github.com/q191201771/nezha/pkg/log" "github.com/q191201771/nezha/pkg/nazalog"
"net" "net"
"testing" "testing"
) )
@ -29,7 +29,7 @@ func TestWriteTimeout(t *testing.T) {
b := make([]byte, 128) b := make([]byte, 128)
for { for {
n, err := c.Write(b) n, err := c.Write(b)
log.Infof("%d %+v", n, err) nazalog.Infof("%d %+v", n, err)
if err != nil { if err != nil {
break break
} }

4
pkg/mockserver/listenserver.go
Unescape Escape View File

@ -1,7 +1,7 @@
package mockserver package mockserver
import ( import (
"github.com/q191201771/nezha/pkg/log" "github.com/q191201771/nezha/pkg/nazalog"
"net" "net"
"time" "time"
) )
@ -19,7 +19,7 @@ func (s *MockListenServer) Run(addr string) (err error) {
} }
for i := 0; ; i++ { for i := 0; ; i++ {
if _, err := net.DialTimeout("tcp", addr, time.Duration(200)*time.Millisecond); err != nil { if _, err := net.DialTimeout("tcp", addr, time.Duration(200)*time.Millisecond); err != nil {
log.Infof("Dial failed. i=%d, err=%+v", i, err) nazalog.Infof("Dial failed. i=%d, err=%+v", i, err)
break break
} }

2
pkg/nazajson/nazajson.go → pkg/nazajson/json.go
Unescape Escape View File

@ -20,6 +20,8 @@ func (j *JSON) Init(raw []byte) error {
return json.Unmarshal(raw, &j.m) return json.Unmarshal(raw, &j.m)
} }
// 判断 json 中某个字段是否存在
// @param path 支持多级格式，用句号`.`分隔，比如 log.level
func (j *JSON) Exist(path string) bool { func (j *JSON) Exist(path string) bool {
return exist(j.m, path) return exist(j.m, path)
} }

4
pkg/nazajson/nazajson_test.go → pkg/nazajson/json_test.go
Unescape Escape View File

@ -2,7 +2,7 @@ package nazajson
import ( import (
"github.com/q191201771/nezha/pkg/assert" "github.com/q191201771/nezha/pkg/assert"
"github.com/q191201771/nezha/pkg/log" "github.com/q191201771/nezha/pkg/nazalog"
"testing" "testing"
) )
@ -114,5 +114,5 @@ func BenchmarkExist(b *testing.B) {
exist = j.Exist(".") exist = j.Exist(".")
exist = j.Exist("..") exist = j.Exist("..")
} }
log.Debug(exist) nazalog.Debug(exist)
} }

2
pkg/log/global.go → pkg/nazalog/global.go
Unescape Escape View File

@ -1,4 +1,4 @@
package log package nazalog
import ( import (
"fmt" "fmt"

4
pkg/log/log.go → pkg/nazalog/log.go
Unescape Escape View File

@ -1,5 +1,5 @@
// package log 日志库 // package nazalog 日志库
package log package nazalog
import ( import (
"bytes" "bytes"

2
pkg/log/log_test.go → pkg/nazalog/log_test.go
Unescape Escape View File

@ -1,4 +1,4 @@
package log package nazalog
import ( import (
"encoding/hex" "encoding/hex"
Write Preview
Loading…
Cancel
Save