Bumped v0.5.5

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

Author: vishr

Makefile

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

cmd/daemon.go

@@ -6,17 +6,13 @@ import (
   "github.com/radovskyb/watcher"
   "github.com/spf13/cobra"
   "github.com/spf13/viper"
-  "io"
   "io/ioutil"
   "os"
   "os/exec"
   "strconv"
   "time"
 )
 
-func checkKey() {
-}
-
 func startDaemon() {
   if viper.GetString("api_key") == "" {
     exit("To use tunnel you need an api key (https://tunnel.labstack.com) in $HOME/.tunnel/config.yaml")
@@ -85,9 +81,15 @@ var daemonCmd = &cobra.Command{
       req := new(daemon.StopDaemonRequest)
       rep := new(daemon.StopDaemonReply)
       err = c.Call("Server.StopDaemon", req, rep)
-      if err != nil && err != io.ErrUnexpectedEOF {
+      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()
     }
   },
 }

cmd/root.go

@@ -4,13 +4,12 @@ import (
   "errors"
   "fmt"
   "github.com/labstack/tunnel-client/daemon"
+  "github.com/spf13/cobra"
   "net"
   "os"
   "path/filepath"
   "strings"
 
-  "github.com/spf13/cobra"
-
   "github.com/mitchellh/go-homedir"
   "github.com/spf13/viper"
 )

daemon/server.go

@@ -13,7 +13,6 @@ import (
   "net/rpc"
   "os"
   "os/signal"
-  "strconv"
   "syscall"
 )
 
@@ -145,25 +144,7 @@ func Start() {
 
 func (s *Server) StopDaemon(req *StopDaemonRequest, rep *StopDaemonReply) (err error) {
   log.Warn("stopping daemon")
-  if err = s.stopConnections(); err != nil {
-    return
-  }
-  d, _ := ioutil.ReadFile(viper.GetString("daemon_pid"))
-  pid, err := strconv.Atoi(string(d))
-  if err != nil {
-    return
-  }
-  p, err := os.FindProcess(pid)
-  if err != nil {
-    return
-  }
-  if err = p.Kill(); err != nil {
-    return
-  }
-  if err = os.Remove(viper.GetString("daemon_pid")); err != nil {
-    return
-  }
-  return os.Remove(viper.GetString("daemon_addr"))
+  return s.stopConnections()
 }
 
 func (s *Server) findConnection(c *Connection) (err error) {