summaryrefslogtreecommitdiff
path: root/pkg/server/server.go
diff options
context:
space:
mode:
authorMikhail Osipov <mike.osipov@gmail.com>2021-08-27 20:05:06 +0300
committerMikhail Osipov <mike.osipov@gmail.com>2021-08-27 20:05:06 +0300
commit3015840d9835717762de52e091adb58f1e2e3b63 (patch)
tree5bdaf042d539725b7b630f34679762bb07996255 /pkg/server/server.go
parent5e64643ca8444321845b4839fa62875c32b0b51a (diff)
add version to client and daemon
Diffstat (limited to 'pkg/server/server.go')
-rw-r--r--pkg/server/server.go13
1 files changed, 8 insertions, 5 deletions
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 43cd542..524b6af 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -18,6 +18,8 @@ type Server struct {
listen net.Listener
since time.Time
+ version string
+
wg sync.WaitGroup
mu sync.Mutex
@@ -97,7 +99,7 @@ func (s *Server) isDone() bool {
}
}
-func New(path string) (*Server, error) {
+func New(path string, version string) (*Server, error) {
listen, err := net.Listen("unix", path)
if err != nil {
return nil, err
@@ -111,6 +113,7 @@ func New(path string) (*Server, error) {
since: time.Now(),
done: make(chan struct{}),
tunnels: make(automap),
+ version: version,
}
return s, nil
@@ -142,7 +145,7 @@ func (s *Server) Serve() {
s.wg.Add(1)
- go c.handle()
+ go c.reader()
}
s.wg.Wait()
@@ -196,14 +199,14 @@ func (c *client) newRequest() *request {
return r
}
-func (c *client) handle() {
+func (c *client) reader() {
defer c.close()
for {
req, er := c.r.Decode()
if er != nil {
if !errors.Is(er, io.EOF) {
- log.Println(c, "handle:", er)
+ log.Println(c, "reader:", er)
}
break
}
@@ -220,7 +223,7 @@ func (c *client) handle() {
ew := c.w.Encode(r.out.String())
if ew != nil {
- log.Println(c, "handle:", ew)
+ log.Println(c, "reader:", ew)
break
}
}