From 9e04a8bee8492cb662ebc8b7fd50a23c48c7d03f Mon Sep 17 00:00:00 2001 From: Mikhail Osipov Date: Thu, 20 Feb 2020 04:56:03 +0300 Subject: streams and tunnels --- pkg/server/server.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'pkg/server/server.go') diff --git a/pkg/server/server.go b/pkg/server/server.go index 4f012d0..ce910f3 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -24,24 +24,24 @@ type Server struct { once sync.Once done chan struct{} - streams streams + tunnels automap env env - nextCid uint64 + nextCid int } type client struct { - id uint64 + id int s *Server conn net.Conn - nextRid uint64 + nextRid int } type request struct { - id uint64 + id int c *client @@ -135,7 +135,7 @@ func New() (*Server, error) { listen: listen, since: time.Now(), done: make(chan struct{}), - streams: make(streams), + tunnels: make(automap), } return s, nil @@ -307,7 +307,7 @@ func (r *request) run(query string) { r.parse(query) - log.Printf("%s %s run [%s] '%s'", r.c, r, r.cmd.name, strings.Join(r.args, " ")) + log.Println(r.c, r, ">", r.cmd.name, strings.Join(r.args, " ")) r.c.s.mu.Lock() defer r.c.s.mu.Unlock() -- cgit v1.2.3-70-g09d2