log: 增加 LogServer 和 LogClient

log/log.go

@@ -21,10 +21,10 @@ const (
 )
 
 const (
-	prefixDebug   = "[D] "
-	prefixInfo    = "[I] "
-	prefixWarning = "[W] "
-	prefixError   = "[E] "
+	PrefixDebug   = "[D] "
+	PrefixInfo    = "[I] "
+	PrefixWarning = "[W] "
+	PrefixError   = "[E] "
 )
 
 var (
@@ -35,10 +35,10 @@ var (
 )
 
 var (
-	socketDebug   = log.New(os.Stdout, prefixDebug, Flag)
-	socketInfo    = log.New(os.Stdout, prefixInfo, Flag)
-	socketWarning = log.New(os.Stderr, prefixWarning, Flag)
-	socketError   = log.New(os.Stderr, prefixError, Flag)
+	socketDebug   = log.New(os.Stdout, PrefixDebug, Flag)
+	socketInfo    = log.New(os.Stdout, PrefixInfo, Flag)
+	socketWarning = log.New(os.Stderr, PrefixWarning, Flag)
+	socketError   = log.New(os.Stderr, PrefixError, Flag)
 )
 
 func SetLevel(level uint8) {
@@ -160,7 +160,7 @@ func (l *loggerWrite) Write(p []byte) (n int, err error) {
 	n, err = l.run.Write(p)
 
 	level := string(p[:4])
-	if level == prefixWarning || level == prefixError {
+	if level == PrefixWarning || level == PrefixError {
 		n, err = l.err.Write(p)
 	}
 	return

log/logs/logs.go

@@ -3,6 +3,7 @@ package logs
 import (
 	"fmt"
 	"io"
+	"net"
 	"os"
 	"path/filepath"
 	"sync"
@@ -141,11 +142,27 @@ func NewStdout() *Logs {
 	return logs
 }
 
-func New(filePrefix string, path string) (*Logs, error) {
+func New(filePrefix, path string) (*Logs, error) {
 	mgr := NewManager(filePrefix, path)
-	logs, err := mgr.Get("")
+	logs, err := mgr.Get(filePrefix)
 	if err != nil {
 		return nil, err
 	}
 	return logs, nil
 }
+
+func NewClient(logPrefix, address string) (*Logs, error) {
+	udpAddr, err := net.ResolveUDPAddr("udp", address)
+	if err != nil {
+		return nil, err
+	}
+	conn, err := net.DialUDP("udp", nil, udpAddr)
+	if err != nil {
+		return nil, err
+	}
+	l := &Logs{
+		closer: conn,
+		log:    log.New(conn, fmt.Sprintf("[%s] ", logPrefix), log.LstdFlags),
+	}
+	return l, nil
+}

log/logs/logs_test.go

@@ -48,3 +48,12 @@ func BenchmarkNewManager(b *testing.B) {
 		lg.Println("%d", i)
 	}
 }
+
+func TestNewClient(t *testing.T) {
+	l, err := NewClient("svc", "127.0.0.1:3377")
+	if err != nil {
+		t.Error(err)
+		return
+	}
+	l.Println("sssss")
+}

log/server.go

@@ -5,13 +5,63 @@ import (
 	"io"
 	"log"
 	"net"
+	"os"
 	"path/filepath"
+	"strings"
+	"sync"
 )
 
 const (
 	ServerMaxSize = 4194304 // 4MB
 )
 
+type ServerWriter struct {
+	Filepath string
+	W        map[string]io.Writer
+	Run      io.Writer
+	Err      io.Writer
+
+	mu sync.Mutex
+}
+
+// trim ÒƳý [] ÖÐÀ¨ºÅ
+func (l *ServerWriter) trim(s string) string {
+	s = strings.TrimPrefix(s, "[")
+	s = strings.TrimSuffix(s, "[ ")
+	return s
+}
+
+func (l *ServerWriter) Write(p []byte) (n int, err error) {
+	level := string(p[:4])
+	if logs, ok := l.W[level]; ok {
+		return logs.Write(p)
+	}
+	switch level {
+	case PrefixDebug, PrefixInfo, PrefixWarning, PrefixError:
+		if level == PrefixWarning || level == PrefixError {
+			n, err = l.Err.Write(p)
+		}
+		n, err = l.Run.Write(p)
+	default:
+		w, err := NewWriter(l.trim(level), ".log", filepath.Join(l.Filepath, l.trim(level)))
+		if err == nil {
+			l.mu.Lock()
+			l.W[level] = w
+			l.mu.Unlock()
+			n, err = w.Write(p)
+		} else {
+			_, _ = os.Stdout.Write(p)
+		}
+	}
+	return
+}
+
+func NewServerWriter() *ServerWriter {
+	sw := new(ServerWriter)
+	sw.W = make(map[string]io.Writer)
+	return sw
+}
+
 type Server struct {
 	W    io.Writer
 	Conn net.PacketConn
@@ -20,8 +70,7 @@ type Server struct {
 func (c *Server) handle(b []byte) {
 	_, err := c.W.Write(b)
 	if err != nil {
-		log.Println("handle err:", err)
-		log.Println("handle text:", string(b))
+		_, _ = os.Stdout.Write(b)
 	}
 }
 
@@ -45,19 +94,19 @@ func (c *Server) ListenAndServe() error {
 }
 
 func NewServer(address, path string) (*Server, error) {
-	l := new(LevelWriter)
-	l.Console = false
+	sw := NewServerWriter()
+	sw.Filepath = path
 	var err error
-	l.Run, err = NewWriter("r", ".log", filepath.Join(address, path, "run"))
+	sw.Run, err = NewWriter("r", ".log", filepath.Join(path, "run"))
 	if err != nil {
 		return nil, err
 	}
-	l.Err, err = NewWriter("e", ".log", filepath.Join(address, path, "err"))
+	sw.Err, err = NewWriter("e", ".log", filepath.Join(path, "err"))
 	if err != nil {
 		return nil, err
 	}
 	s := new(Server)
-	s.W = l
+	s.W = sw
 	s.Conn, err = net.ListenPacket("udp", address)
 	if err != nil {
 		return nil, err
@@ -105,11 +154,10 @@ func NewClient(address string) (*Client, error) {
 		return nil, err
 	}
 	c := new(Client)
-	w := &LevelWriter{Run: conn, Err: conn, Console: c.Console}
 	c.conn = conn
-	c.debug = log.New(w, prefixDebug, Flag)
-	c.info = log.New(w, prefixInfo, Flag)
-	c.warning = log.New(w, prefixWarning, Flag)
-	c.error = log.New(w, prefixError, Flag)
+	c.debug = log.New(conn, PrefixDebug, Flag)
+	c.info = log.New(conn, PrefixInfo, Flag)
+	c.warning = log.New(conn, PrefixWarning, Flag)
+	c.error = log.New(conn, PrefixError, Flag)
 	return c, nil
 }

log/server_test.go

@@ -21,7 +21,8 @@ func TestNewClient(t *testing.T) {
 		t.Error(err)
 		return
 	}
-	for {
-		conn.Debug("Test%s", "1111111")
-	}
+	conn.Debug("Test %s", "Debug")
+	conn.Info("Test %s", "Info")
+	conn.Warning("Test %s", "Warning")
+	conn.Error("Test %s", "Error")
 }

log/type.go

@@ -3,7 +3,6 @@ package log
 import (
 	"io"
 	"log"
-	"os"
 )
 
 type (
@@ -28,21 +27,3 @@ const (
 func New(out io.Writer, prefix string, flag int) *Logger {
 	return log.New(out, prefix, flag)
 }
-
-type LevelWriter struct {
-	Console bool
-	Run     io.Writer
-	Err     io.Writer
-}
-
-func (l *LevelWriter) Write(p []byte) (n int, err error) {
-	if l.Console {
-		_, _ = os.Stdout.Write(p)
-	}
-	n, err = l.Run.Write(p)
-	level := string(p[:4])
-	if level == prefixWarning || level == prefixError {
-		n, err = l.Err.Write(p)
-	}
-	return
-}