Bumped v0.5.10

Signed-off-by: Vishal Rana <[email protected]>

Author: vishr

Makefile

@@ -1,5 +1,5 @@
 IMAGE = labstack/tunnel
-VERSION = 0.5.9
+VERSION = 0.5.10
 
 publish:
 	git tag v$(VERSION)

cmd/version.go

@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	version = "v0.5.9"
+	version = "v0.5.10"
 )
 
 var versionCmd = &cobra.Command{

daemon/connection.go

@@ -42,6 +42,7 @@ type (
     reconnectChan chan error
     stopChan      chan bool
     started       bool
+    stopped       bool
     retries       time.Duration
     Header        *Header
     ID            string `json:"id"`
@@ -91,11 +92,6 @@ func (s *Server) newConnection(req *ConnectRequest) (c *Connection, err error) {
     acceptChan:    make(chan net.Conn),
     reconnectChan: make(chan error),
     stopChan:      make(chan bool),
-    Header: &Header{
-      ID:     id,
-      Key:    viper.GetString("api_key"),
-      Target: req.Address,
-    },
     ID:            id,
     TargetAddress: req.Address,
     RemoteHost:    "0.0.0.0",
@@ -124,7 +120,12 @@ func (s *Server) newConnection(req *ConnectRequest) (c *Connection, err error) {
   if c.Configuration.Protocol != ProtocolHTTPS {
     c.RemotePort = 0
   }
-  c.Header.Name = c.Name
+  c.Header = &Header{
+    ID:     id,
+    Name:   c.Name,
+    Key:    viper.GetString("api_key"),
+    Target: req.Address,
+  }
   return
 }
 
@@ -199,28 +200,35 @@ RECONNECT:
   // Remote listener
   l, err := sc.Listen("tcp", fmt.Sprintf("%s:%d", c.RemoteHost, c.RemotePort))
   if err != nil {
-    log.Errorf("failed to listen on remote host: %v", err)
+    c.startChan <- fmt.Errorf("failed to listen on remote host: %v", err)
+    return
+  }
+  if err = c.server.findConnection(c); err != nil {
+    c.startChan <- fmt.Errorf("failed to find connection: %v", err)
     return
   }
   // Note: Don't close the listener as it prevents closing the underlying connection
   c.retries = 0
   if !c.started {
     c.started = true
-    c.startChan <- c.server.findConnection(c)
+    c.startChan <- nil
   }
+  connections[c.ID] = c
   log.Infof("connection %s is online", c.Name)
 
   // Close
   defer func() {
     log.Infof("closing connection: %s", c.Name)
+    delete(connections, c.ID);
     defer sc.Close()
   }()
 
   // Accept connections
   go func() {
     for {
       in, err := l.Accept()
-      if err != nil {
+      if err != nil && !c.stopped {
+        log.Error(err)
         c.reconnectChan <- err
         return
       }
@@ -232,6 +240,7 @@ RECONNECT:
   for {
     select {
     case <-c.stopChan:
+      c.stopped = true
       return
     case in := <-c.acceptChan:
       go c.handle(in)

daemon/server.go

@@ -2,7 +2,6 @@ package daemon
 
 import (
   "errors"
-  "fmt"
   "github.com/fsnotify/fsnotify"
   "github.com/labstack/gommon/log"
   "github.com/spf13/viper"
@@ -17,8 +16,7 @@ import (
 
 type (
   Server struct {
-    resty       *resty.Client
-    Connections map[string]*Connection
+    resty *resty.Client
   }
 
   Protocol string
@@ -54,6 +52,10 @@ const (
   ProtocolTLS   = "tls"
 )
 
+var (
+  connections = map[string]*Connection{}
+)
+
 func (s *Server) Connect(req *ConnectRequest, rep *ConnectReply) (err error) {
   c, err := s.newConnection(req)
   if err != nil {
@@ -64,15 +66,17 @@ func (s *Server) Connect(req *ConnectRequest, rep *ConnectReply) (err error) {
 }
 
 func (s *Server) PS(req *PSRequest, rep *PSReply) (err error) {
-  for _, c := range s.Connections {
+  for _, c := range connections {
     rep.Connections = append(rep.Connections, c)
   }
   return nil
 }
 
 func (s *Server) RM(req *RMRequest, rep *RMReply) error {
-  if c, ok := s.Connections[req.Name]; ok {
-    c.stop()
+  for _, c := range connections {
+    if c.Name == req.Name {
+      c.stop()
+    }
   }
   return nil
 }
@@ -87,10 +91,7 @@ func Start() {
   })
   r.SetHeader("Content-Type", "application/json")
   r.SetHeader("User-Agent", "tunnel/client")
-  s := &Server{
-    resty:       r,
-    Connections: map[string]*Connection{},
-  }
+  s := &Server{resty: r}
   rpc.Register(s)
 
   // Shutdown hook
@@ -127,21 +128,5 @@ func (s *Server) findConnection(c *Connection) (err error) {
   if res.IsError() {
     return errors.New(e.Message)
   }
-  s.Connections[c.Name] = c
-  return
-}
-
-func (s *Server) deleteAll() (err error) {
-  log.Warnf("removing all connections")
-  e := new(Error)
-  res, err := s.resty.R().
-    SetError(e).
-    Delete("/connections")
-  if err != nil {
-    return
-  }
-  if res.IsError() {
-    return fmt.Errorf("failed to delete all connections")
-  }
   return
 }