Bumped v0.5.7

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

Author: vishr

Makefile

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

cmd/daemon.go

@@ -73,23 +73,12 @@ var daemonCmd = &cobra.Command{
     if args[0] == "start" {
       daemon.Start()
     } else if args[0] == "stop" {
-      c, err := getClient()
-      if err != nil {
-        exit(err)
-      }
-      defer c.Close()
-      req := new(daemon.StopDaemonRequest)
-      rep := new(daemon.StopDaemonReply)
-      err = c.Call("Server.StopDaemon", req, rep)
-      if err != nil {
-        exit(err)
-      }
       defer os.Remove(viper.GetString("daemon_addr"))
       defer os.Remove(viper.GetString("daemon_pid"))
       d, _ := ioutil.ReadFile(viper.GetString("daemon_pid"))
       pid, _ := strconv.Atoi(string(d))
       p, _ := os.FindProcess(pid)
-      p.Kill()
+      p.Signal(os.Interrupt)
     }
   },
 }

daemon/connection.go

@@ -19,13 +19,11 @@ import (
 
 type (
   Header struct {
-    ID        string `json:"id"`
-    Key       string `json:"key"`
-    Name      string `json:"name"`
-    Target    string `json:"target"`
-    TLS       bool   `json:"tls"`
-    Started   bool   `json:"started"`
-    Reconnect bool   `json:"reconnect"`
+    ID     string `json:"id"`
+    Key    string `json:"key"`
+    Name   string `json:"name"`
+    Target string `json:"target"`
+    TLS    bool   `json:"tls"`
   }
 
   Configuration struct {
@@ -43,6 +41,7 @@ type (
     acceptChan    chan net.Conn
     reconnectChan chan error
     stopChan      chan bool
+    started       bool
     retries       time.Duration
     Header        *Header
     ID            string `json:"id"`
@@ -131,20 +130,13 @@ func (s *Server) newConnection(req *ConnectRequest) (c *Connection, err error) {
 
 func (c *Connection) connect() {
 RECONNECT:
-  if c.Header.Reconnect {
+  if c.Status == ConnectionStatusReconnecting {
     c.retries++
     if c.retries > 5 {
       log.Errorf("failed to reconnect connection: %s", c.Name)
-      if err := c.delete(); err != nil {
-        log.Error(err)
-      }
       return
     }
     time.Sleep(c.retries * c.retries * time.Second)
-    c.Status = ConnectionStatusReconnecting
-    if err := c.update(); err != nil {
-      log.Error(err)
-    }
     log.Warnf("reconnecting connection: name=%s, retry=%d", c.Name, c.retries)
   }
   hostKey, _, _, _, err := ssh.ParseAuthorizedKey(hostBytes)
@@ -200,7 +192,7 @@ RECONNECT:
   }
   if err != nil {
     log.Error(err)
-    c.Header.Reconnect = true
+    c.Status = ConnectionStatusReconnecting
     goto RECONNECT
   }
 
@@ -210,17 +202,13 @@ RECONNECT:
     log.Errorf("failed to listen on remote host: %v", err)
     return
   }
-  if err := c.server.findConnection(c); err != nil {
-    log.Error(err)
-    return
-  }
-  c.Header.Reconnect = false
+  // Note: Don't close the listener as it prevents closing the underlying connection
   c.retries = 0
-  if !c.Header.Started {
-    c.Header.Started = true
+  if !c.started {
+    c.started = true
     c.startChan <- true
   }
-  // Note: Don't close the listener as it prevents closing the underlying connection
+  log.Infof("connection %s is online", c.Name)
 
   // Close
   defer func() {
@@ -285,35 +273,3 @@ func (c *Connection) stop() {
   log.Warnf("stopping connection: %s", c.Name)
   c.stopChan <- true
 }
-
-func (c *Connection) update() error {
-  e := new(Error)
-  res, err := c.server.resty.R().
-    SetBody(c).
-    SetResult(c).
-    SetError(e).
-    Put("/connections/" + c.ID)
-  if err != nil {
-    return err
-  }
-  if res.IsError() {
-    return fmt.Errorf("failed to update the connection: name=%s, error=%s", c.Name, e.Message)
-  }
-  return nil
-}
-
-func (c *Connection) delete() (err error) {
-  log.Warnf("removing connection: %s", c.Name)
-  e := new(Error)
-  res, err := c.server.resty.R().
-    SetError(e).
-    Delete("/connections/" + c.ID)
-  if err != nil {
-    return
-  }
-  if res.IsError() {
-    return fmt.Errorf("failed to delete the connection: %s", e.Message)
-  }
-  delete(c.server.Connections, c.Name)
-  return
-}

daemon/server.go

@@ -6,7 +6,6 @@ import (
   "github.com/fsnotify/fsnotify"
   "github.com/labstack/gommon/log"
   "github.com/spf13/viper"
-  "golang.org/x/sync/errgroup"
   "gopkg.in/resty.v1"
   "io/ioutil"
   "net"
@@ -47,12 +46,6 @@ type (
 
   RMReply struct {
   }
-
-  StopDaemonRequest struct {
-  }
-
-  StopDaemonReply struct {
-  }
 )
 
 const (
@@ -68,7 +61,7 @@ func (s *Server) Connect(req *ConnectRequest, rep *ConnectReply) (err error) {
   }
   go c.connect()
   <-c.startChan
-  return
+  return s.findConnection(c)
 }
 
 func (s *Server) PS(req *PSRequest, rep *PSReply) (err error) {
@@ -81,23 +74,10 @@ func (s *Server) PS(req *PSRequest, rep *PSReply) (err error) {
 func (s *Server) RM(req *RMRequest, rep *RMReply) error {
   if c, ok := s.Connections[req.Name]; ok {
     c.stop()
-    return c.delete()
   }
   return nil
 }
 
-func (s *Server) stopConnections() error {
-  g := new(errgroup.Group)
-  for _, c := range s.Connections {
-    c := c
-    g.Go(func() error {
-      c.stop()
-      return c.delete()
-    })
-  }
-  return g.Wait()
-}
-
 func Start() {
   log.Info("starting daemon")
   r := resty.New()
@@ -119,16 +99,9 @@ func Start() {
   signal.Notify(c, os.Interrupt, syscall.SIGTERM)
   go func() {
     <-c
-    if err := s.stopConnections(); err != nil {
-      log.Error("failed stopping connections: %v", err)
-    }
+    log.Warn("stopping daemon")
   }()
 
-  // Cleanup
-  // if err := s.deleteAll(); err != nil {
-  //   log.Error(err)
-  // }
-
   // Listen
   l, e := net.Listen("tcp", "127.0.0.1:0")
   if e != nil {
@@ -142,11 +115,6 @@ func Start() {
   rpc.Accept(l)
 }
 
-func (s *Server) StopDaemon(req *StopDaemonRequest, rep *StopDaemonReply) (err error) {
-  log.Warn("stopping daemon")
-  return s.stopConnections()
-}
-
 func (s *Server) findConnection(c *Connection) (err error) {
   e := new(Error)
   res, err := s.resty.R().