delete timestamp from logger

exec_test.go

@@ -67,7 +67,8 @@ func TestLocalSave(t *testing.T) {
 
 	reader := bytes.NewReader(binBytes)
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	timeout := time.Duration(5 * time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
 	err = LocalPut(ctx, SaveMethod, reader, binSize, &params, &result, auth, saveHandler)
@@ -88,7 +89,8 @@ func TestLocalLoad(t *testing.T) {
 	binBytes := make([]byte, 0)
 	writer := bytes.NewBuffer(binBytes)
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	timeout := time.Duration(5 * time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
 	err = LocalGet(ctx, LoadMethod, writer, &params, &result, auth, loadHandler)
@@ -101,7 +103,7 @@ func TestLocalLoad(t *testing.T) {
 
 func TestNetExec(t *testing.T) {
 	go testServ(false)
-	time.Sleep(10 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 	err := clientHello()
 
 	require.NoError(t, err)
@@ -109,21 +111,21 @@ func TestNetExec(t *testing.T) {
 
 func TestNetSave(t *testing.T) {
 	go testServ(false)
-	time.Sleep(10 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 	err := clientSave()
 	require.NoError(t, err)
 }
 
 func TestNetLoad(t *testing.T) {
 	go testServ(false)
-	time.Sleep(10 * time.Millisecond)
+	time.Sleep(100 * time.Millisecond)
 	err := clientLoad()
 	require.NoError(t, err)
 }
 
 func BenchmarkNetPut(b *testing.B) {
 	go testServ(true)
-	time.Sleep(10 * time.Millisecond)
+	time.Sleep(1000 * time.Millisecond)
 	clientSave()
 
 	pBench := func(pb *testing.PB) {
@@ -148,10 +150,11 @@ func clientHello() error {
 	binBytes := make([]byte, binSize)
 	rand.Read(binBytes)
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	timeout := time.Duration(5 * time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	err = Exec(ctx, "127.0.0.1:8081", HelloMethod, &params, &result, auth)
+	err = Exec(ctx, "127.0.0.1:18081", HelloMethod, &params, &result, auth)
 	if err != nil {
 		logError("method err:", err)
 		return err
@@ -176,10 +179,11 @@ func clientSave() error {
 
 	reader := bytes.NewReader(binBytes)
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	timeout := time.Duration(5 * time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	err = Put(ctx, "127.0.0.1:8081", SaveMethod, reader, binSize, &params, &result, auth)
+	err = Put(ctx, "127.0.0.1:18081", SaveMethod, reader, binSize, &params, &result, auth)
 	if err != nil {
 		logError("method err:", err)
 		return err
@@ -200,10 +204,11 @@ func clientLoad() error {
 	binBytes := make([]byte, 0)
 	writer := bytes.NewBuffer(binBytes)
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	timeout := time.Duration(5 * time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
-	err = Get(ctx, "127.0.0.1:8081", LoadMethod, writer, &params, &result, auth)
+	err = Get(ctx, "127.0.0.1:18081", LoadMethod, writer, &params, &result, auth)
 	if err != nil {
 		logError("method err:", err)
 		return err
@@ -228,6 +233,7 @@ func testServ(quiet bool) error {
 		SetAccessWriter(io.Discard)
 		SetMessageWriter(io.Discard)
 	}
+
 	serv := NewService()
 	serv.Handle(HelloMethod, helloHandler)
 	serv.Handle(SaveMethod, saveHandler)
@@ -239,7 +245,7 @@ func testServ(quiet bool) error {
 	serv.PostMiddleware(LogResponse)
 	serv.PostMiddleware(LogAccess)
 
-	err = serv.Listen(":8081")
+	err = serv.Listen(":18081")
 	if err != nil {
 		return err
 	}
@@ -277,7 +283,8 @@ func helloHandler(content *Content) error {
 		return err
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	timeout := time.Duration(5 * time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
 	err = content.ReadBin(ctx, io.Discard)
@@ -308,7 +315,8 @@ func saveHandler(content *Content) error {
 	bufferBytes := make([]byte, 0, 1024)
 	binWriter := bytes.NewBuffer(bufferBytes)
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	timeout := time.Duration(5 * time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
 	err = content.ReadBin(ctx, binWriter)
@@ -336,7 +344,8 @@ func loadHandler(content *Content) error {
 		return err
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second))
+	timeout := time.Duration(5 * time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
 	defer cancel()
 
 	err = content.ReadBin(ctx, io.Discard)

logger.go

@@ -10,30 +10,27 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"time"
 )
 
-var messageWriter io.Writer = os.Stdout
-var accessWriter io.Writer = os.Stdout
+var (
+	messageWriter io.Writer = os.Stdout
+	accessWriter  io.Writer = os.Stdout
+)
 
 func logDebug(messages ...any) {
-	stamp := time.Now().Format(time.RFC3339)
-	fmt.Fprintln(messageWriter, stamp, "debug", messages)
+	fmt.Fprintln(messageWriter, "debug:", messages)
 }
 
 func logInfo(messages ...any) {
-	stamp := time.Now().Format(time.RFC3339)
-	fmt.Fprintln(messageWriter, stamp, "info", messages)
+	fmt.Fprintln(messageWriter, "info:", messages)
 }
 
 func logError(messages ...any) {
-	stamp := time.Now().Format(time.RFC3339)
-	fmt.Fprintln(messageWriter, stamp, "error", messages)
+	fmt.Fprintln(messageWriter, "error:", messages)
 }
 
 func logAccess(messages ...any) {
-	stamp := time.Now().Format(time.RFC3339)
-	fmt.Fprintln(accessWriter, stamp, "access", messages)
+	fmt.Fprintln(accessWriter, "access:", messages)
 }
 
 func SetAccessWriter(writer io.Writer) {

server.go

@@ -5,344 +5,344 @@
 package dsrpc
 
 import (
-        "context"
-        "crypto/tls"
-        "errors"
-        "fmt"
-        "io"
-        "net"
-        "sync"
-        "time"
+	"context"
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"io"
+	"net"
+	"sync"
+	"time"
 
-        encoder "encoding/json"
+	encoder "encoding/json"
 )
 
 type HandlerFunc = func(*Content) error
 
 type Service struct {
-        handlers    map[string]HandlerFunc
-        ctx         context.Context
-        cancel      context.CancelFunc
-        wg          *sync.WaitGroup
-        preMw       []HandlerFunc
-        postMw      []HandlerFunc
-        keepalive   bool
-        kaTime      time.Duration
-        kaMtx       sync.Mutex
-        listener    net.Listener
-        tcpListener *net.TCPListener
+	handlers    map[string]HandlerFunc
+	ctx         context.Context
+	cancel      context.CancelFunc
+	wg          *sync.WaitGroup
+	preMw       []HandlerFunc
+	postMw      []HandlerFunc
+	keepalive   bool
+	kaTime      time.Duration
+	kaMtx       sync.Mutex
+	listener    net.Listener
+	tcpListener *net.TCPListener
 }
 
 func NewService() *Service {
-        rdrpc := &Service{}
-        rdrpc.handlers = make(map[string]HandlerFunc)
-        ctx, cancel := context.WithCancel(context.Background())
-        rdrpc.ctx = ctx
-        rdrpc.cancel = cancel
-        var wg sync.WaitGroup
-        rdrpc.wg = &wg
-        rdrpc.preMw = make([]HandlerFunc, 0)
-        rdrpc.postMw = make([]HandlerFunc, 0)
+	rdrpc := &Service{}
+	rdrpc.handlers = make(map[string]HandlerFunc)
+	ctx, cancel := context.WithCancel(context.Background())
+	rdrpc.ctx = ctx
+	rdrpc.cancel = cancel
+	var wg sync.WaitGroup
+	rdrpc.wg = &wg
+	rdrpc.preMw = make([]HandlerFunc, 0)
+	rdrpc.postMw = make([]HandlerFunc, 0)
 
-        return rdrpc
+	return rdrpc
 }
 
 func (svc *Service) PreMiddleware(mw HandlerFunc) {
-        svc.preMw = append(svc.preMw, mw)
+	svc.preMw = append(svc.preMw, mw)
 }
 
 func (svc *Service) PostMiddleware(mw HandlerFunc) {
-        svc.postMw = append(svc.postMw, mw)
+	svc.postMw = append(svc.postMw, mw)
 }
 
 func (svc *Service) Handle(method string, handler HandlerFunc) {
-        svc.handlers[method] = handler
+	svc.handlers[method] = handler
 }
 
 func (svc *Service) SetKeepAlive(flag bool) {
-        svc.kaMtx.Lock()
-        defer svc.kaMtx.Unlock()
-        svc.keepalive = true
+	svc.kaMtx.Lock()
+	defer svc.kaMtx.Unlock()
+	svc.keepalive = true
 }
 
 func (svc *Service) SetKeepAlivePeriod(interval time.Duration) {
-        svc.kaMtx.Lock()
-        defer svc.kaMtx.Unlock()
-        svc.kaTime = interval
+	svc.kaMtx.Lock()
+	defer svc.kaMtx.Unlock()
+	svc.kaTime = interval
 }
 
 func (svc *Service) Listen(address string) error {
-        var err error
-        logInfo("server listen:", address)
+	var err error
+	logInfo("server listen:", address)
 
-        addr, err := net.ResolveTCPAddr("tcp", address)
-        if err != nil {
-                err = fmt.Errorf("unable to resolve adddress: %s", err)
-                return err
-        }
-        svc.tcpListener, err = net.ListenTCP("tcp", addr)
-        if err != nil {
-                err = fmt.Errorf("unable to start listener: %s", err)
-                return err
-        }
+	addr, err := net.ResolveTCPAddr("tcp", address)
+	if err != nil {
+		err = fmt.Errorf("unable to resolve adddress: %s", err)
+		return err
+	}
+	svc.tcpListener, err = net.ListenTCP("tcp", addr)
+	if err != nil {
+		err = fmt.Errorf("unable to start listener: %s", err)
+		return err
+	}
 
-        for {
-                conn, err := svc.tcpListener.AcceptTCP()
-                if err != nil {
-                        logError("conn accept err:", err)
-                }
-                select {
-                case <-svc.ctx.Done():
-                        return err
-                default:
-                }
-                svc.wg.Add(1)
-                go svc.handleTCPConn(conn, svc.wg)
-        }
-        return err
+	for {
+		conn, err := svc.tcpListener.AcceptTCP()
+		if err != nil {
+			logError("conn accept err:", err)
+		}
+		select {
+		case <-svc.ctx.Done():
+			return err
+		default:
+		}
+		svc.wg.Add(1)
+		go svc.handleTCPConn(conn, svc.wg)
+	}
+	return err
 }
 
 func (svc *Service) ListenTLS(address string, tlsConfig *tls.Config) error {
-        var err error
-        logInfo("server listen:", address)
+	var err error
+	logInfo("server listen:", address)
 
-        svc.listener, err = tls.Listen("tcp", address, tlsConfig)
-        if err != nil {
-                err = fmt.Errorf("unable to start listener: %s", err)
-                return err
-        }
+	svc.listener, err = tls.Listen("tcp", address, tlsConfig)
+	if err != nil {
+		err = fmt.Errorf("unable to start listener: %s", err)
+		return err
+	}
 
-        for {
-                conn, err := svc.listener.Accept()
-                if err != nil {
-                        logError("conn accept err:", err)
-                }
-                select {
-                case <-svc.ctx.Done():
-                        logInfo("accept loop done")
-                        return err
-                default:
-                }
-                svc.wg.Add(1)
-                go svc.handleConn(conn, svc.wg)
-        }
-        return err
+	for {
+		conn, err := svc.listener.Accept()
+		if err != nil {
+			logError("conn accept err:", err)
+		}
+		select {
+		case <-svc.ctx.Done():
+			logInfo("accept loop done")
+			return err
+		default:
+		}
+		svc.wg.Add(1)
+		go svc.handleConn(conn, svc.wg)
+	}
+	return err
 }
 
 func notFound(content *Content) error {
-        execErr := errors.New("method not found")
-        err := content.SendError(execErr)
-        return err
+	execErr := errors.New("method not found")
+	err := content.SendError(execErr)
+	return err
 }
 
 func (svc *Service) Stop() error {
-        var err error
-        // Disable new connection
-        logInfo("cancel rpc accept loop")
-        if svc.listener != nil {
-                svc.listener.Close()
-        }
-        if svc.tcpListener != nil {
-                svc.tcpListener.Close()
-        }
-        svc.cancel()
-        // Wait handlers
-        logInfo("wait rpc handlers")
-        svc.wg.Wait()
-        return err
+	var err error
+	// Disable new connection
+	logInfo("cancel rpc accept loop")
+	if svc.listener != nil {
+		svc.listener.Close()
+	}
+	if svc.tcpListener != nil {
+		svc.tcpListener.Close()
+	}
+	svc.cancel()
+	// Wait handlers
+	logInfo("wait rpc handlers")
+	svc.wg.Wait()
+	return err
 }
 
 func (svc *Service) handleTCPConn(conn *net.TCPConn, wg *sync.WaitGroup) {
-        var err error
-        if svc.keepalive {
-                err = conn.SetKeepAlive(true)
-                if err != nil {
-                        err = fmt.Errorf("unable to set keepalive: %s", err)
-                        return
-                }
-                if svc.kaTime > 0 {
-                        err = conn.SetKeepAlivePeriod(svc.kaTime)
-                        if err != nil {
-                                err = fmt.Errorf("unable to set keepalive period: %s", err)
-                                return
-                        }
-                }
-        }
-        svc.handleConn(conn, wg)
+	var err error
+	if svc.keepalive {
+		err = conn.SetKeepAlive(true)
+		if err != nil {
+			err = fmt.Errorf("unable to set keepalive: %s", err)
+			return
+		}
+		if svc.kaTime > 0 {
+			err = conn.SetKeepAlivePeriod(svc.kaTime)
+			if err != nil {
+				err = fmt.Errorf("unable to set keepalive period: %s", err)
+				return
+			}
+		}
+	}
+	svc.handleConn(conn, wg)
 }
 
 func (svc *Service) handleConn(conn net.Conn, wg *sync.WaitGroup) {
-        var err error
+	var err error
 
-        content := CreateContent(conn)
+	content := CreateContent(conn)
 
-        remoteAddr := conn.RemoteAddr().String()
-        remoteHost, _, _ := net.SplitHostPort(remoteAddr)
-        content.remoteHost = remoteHost
+	remoteAddr := conn.RemoteAddr().String()
+	remoteHost, _, _ := net.SplitHostPort(remoteAddr)
+	content.remoteHost = remoteHost
 
-        content.binReader = conn
-        content.binWriter = io.Discard
+	content.binReader = conn
+	content.binWriter = io.Discard
 
-        exitFunc := func() {
-                conn.Close()
-                wg.Done()
-                if err != nil {
-                        logError("conn handler err:", err)
-                }
-        }
-        defer exitFunc()
+	exitFunc := func() {
+		conn.Close()
+		wg.Done()
+		if err != nil {
+			logError("conn handler err:", err)
+		}
+	}
+	defer exitFunc()
 
-        recovFunc := func() {
-                panicMsg := recover()
-                if panicMsg != nil {
-                        logError("handler panic message:", panicMsg)
-                }
-        }
-        defer recovFunc()
+	recovFunc := func() {
+		panicMsg := recover()
+		if panicMsg != nil {
+			logError("handler panic message:", panicMsg)
+		}
+	}
+	defer recovFunc()
 
-        err = content.ReadRequest()
-        if err != nil {
-                err = err
-                return
-        }
+	err = content.ReadRequest()
+	if err != nil {
+		err = err
+		return
+	}
 
-        err = content.BindMethod()
-        if err != nil {
-                err = err
-                return
-        }
-        for _, mw := range svc.preMw {
-                err = mw(content)
-                if err != nil {
-                        err = err
-                        return
-                }
-        }
-        err = svc.Route(content)
-        if err != nil {
-                err = err
-                return
-        }
-        for _, mw := range svc.postMw {
-                err = mw(content)
-                if err != nil {
-                        err = err
-                        return
-                }
-        }
-        return
+	err = content.BindMethod()
+	if err != nil {
+		err = err
+		return
+	}
+	for _, mw := range svc.preMw {
+		err = mw(content)
+		if err != nil {
+			err = err
+			return
+		}
+	}
+	err = svc.Route(content)
+	if err != nil {
+		err = err
+		return
+	}
+	for _, mw := range svc.postMw {
+		err = mw(content)
+		if err != nil {
+			err = err
+			return
+		}
+	}
+	return
 }
 
 func (svc *Service) Route(content *Content) error {
-        handler, ok := svc.handlers[content.reqBlock.Method]
-        if ok {
-                return handler(content)
-        }
-        return notFound(content)
+	handler, ok := svc.handlers[content.reqBlock.Method]
+	if ok {
+		return handler(content)
+	}
+	return notFound(content)
 }
 
 func (content *Content) ReadRequest() error {
-        var err error
+	var err error
 
-        content.reqPacket.header, err = ReadBytes(content.sockReader, headerSize)
-        if err != nil {
-                return err
-        }
-        content.reqHeader, err = UnpackHeader(content.reqPacket.header)
-        if err != nil {
-                return err
-        }
+	content.reqPacket.header, err = ReadBytes(content.sockReader, headerSize)
+	if err != nil {
+		return err
+	}
+	content.reqHeader, err = UnpackHeader(content.reqPacket.header)
+	if err != nil {
+		return err
+	}
 
-        rpcSize := content.reqHeader.rpcSize
-        content.reqPacket.rcpPayload, err = ReadBytes(content.sockReader, rpcSize)
-        if err != nil {
-                return err
-        }
-        return err
+	rpcSize := content.reqHeader.rpcSize
+	content.reqPacket.rcpPayload, err = ReadBytes(content.sockReader, rpcSize)
+	if err != nil {
+		return err
+	}
+	return err
 }
 
 func (content *Content) BinWriter() io.Writer {
-        return content.sockWriter
+	return content.sockWriter
 }
 
 func (content *Content) BinReader() io.Reader {
-        return content.sockReader
+	return content.sockReader
 }
 
 func (content *Content) BinSize() int64 {
-        return content.reqHeader.binSize
+	return content.reqHeader.binSize
 }
 
 func (content *Content) ReadBin(ctx context.Context, writer io.Writer) error {
-        var err error
-        _, err = CopyBytes(ctx, content.sockReader, writer, content.reqHeader.binSize)
-        return err
+	var err error
+	_, err = CopyBytes(ctx, content.sockReader, writer, content.reqHeader.binSize)
+	return err
 }
 
 func (content *Content) BindMethod() error {
-        var err error
-        err = encoder.Unmarshal(content.reqPacket.rcpPayload, content.reqBlock)
-        return err
+	var err error
+	err = encoder.Unmarshal(content.reqPacket.rcpPayload, content.reqBlock)
+	return err
 }
 
 func (content *Content) BindParams(params any) error {
-        var err error
-        content.reqBlock.Params = params
-        err = encoder.Unmarshal(content.reqPacket.rcpPayload, content.reqBlock)
-        if err != nil {
-                return err
-        }
-        return err
+	var err error
+	content.reqBlock.Params = params
+	err = encoder.Unmarshal(content.reqPacket.rcpPayload, content.reqBlock)
+	if err != nil {
+		return err
+	}
+	return err
 }
 
 func (content *Content) SendResult(result any, binSize int64) error {
-        var err error
-        content.resBlock.Result = result
+	var err error
+	content.resBlock.Result = result
 
-        content.resPacket.rcpPayload, err = content.resBlock.Pack()
-        if err != nil {
-                return err
-        }
-        content.resHeader.rpcSize = int64(len(content.resPacket.rcpPayload))
-        content.resHeader.binSize = binSize
+	content.resPacket.rcpPayload, err = content.resBlock.Pack()
+	if err != nil {
+		return err
+	}
+	content.resHeader.rpcSize = int64(len(content.resPacket.rcpPayload))
+	content.resHeader.binSize = binSize
 
-        content.resPacket.header, err = content.resHeader.Pack()
-        if err != nil {
-                return err
-        }
-        _, err = content.sockWriter.Write(content.resPacket.header)
-        if err != nil {
-                return err
-        }
-        _, err = content.sockWriter.Write(content.resPacket.rcpPayload)
-        if err != nil {
-                return err
-        }
-        return err
+	content.resPacket.header, err = content.resHeader.Pack()
+	if err != nil {
+		return err
+	}
+	_, err = content.sockWriter.Write(content.resPacket.header)
+	if err != nil {
+		return err
+	}
+	_, err = content.sockWriter.Write(content.resPacket.rcpPayload)
+	if err != nil {
+		return err
+	}
+	return err
 }
 
 func (content *Content) SendError(execErr error) error {
-        var err error
+	var err error
 
-        content.resBlock.Error = execErr.Error()
-        content.resBlock.Result = NewEmptyResult()
+	content.resBlock.Error = execErr.Error()
+	content.resBlock.Result = NewEmptyResult()
 
-        content.resPacket.rcpPayload, err = content.resBlock.Pack()
-        if err != nil {
-                return err
-        }
-        content.resHeader.rpcSize = int64(len(content.resPacket.rcpPayload))
-        content.resPacket.header, err = content.resHeader.Pack()
-        if err != nil {
-                return err
-        }
-        _, err = content.sockWriter.Write(content.resPacket.header)
-        if err != nil {
-                return err
-        }
-        _, err = content.sockWriter.Write(content.resPacket.rcpPayload)
-        if err != nil {
-                return err
-        }
-        return err
+	content.resPacket.rcpPayload, err = content.resBlock.Pack()
+	if err != nil {
+		return err
+	}
+	content.resHeader.rpcSize = int64(len(content.resPacket.rcpPayload))
+	content.resPacket.header, err = content.resHeader.Pack()
+	if err != nil {
+		return err
+	}
+	_, err = content.sockWriter.Write(content.resPacket.header)
+	if err != nil {
+		return err
+	}
+	_, err = content.sockWriter.Write(content.resPacket.rcpPayload)
+	if err != nil {
+		return err
+	}
+	return err
 }