From abeac87aec44249bf67f1b0eca471a31086265ca Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sat, 18 Sep 2021 19:27:50 +0300
Subject: fix auto reconnect

---
 internal/clients/args.go | 43 +++++--------------------------------------
 1 file changed, 5 insertions(+), 38 deletions(-)

(limited to 'internal/clients/args.go')

diff --git a/internal/clients/args.go b/internal/clients/args.go
index 081b911..dc71e83 100644
--- a/internal/clients/args.go
+++ b/internal/clients/args.go
@@ -3,12 +3,8 @@ package clients
 import (
 	"flag"
 	"fmt"
-	"os"
-	"path/filepath"
 	"strings"
 
-	"github.com/mimecast/dtail/internal/config"
-	"github.com/mimecast/dtail/internal/io/logger"
 	"github.com/mimecast/dtail/internal/omode"
 
 	gossh "golang.org/x/crypto/ssh"
@@ -33,6 +29,7 @@ type Args struct {
 	Quiet              bool
 	Spartan            bool
 	NoColor            bool
+	Serverless         bool
 }
 
 // Transform the arguments based on certain conditions.
@@ -50,45 +47,15 @@ func (a *Args) Transform(args []string) {
 		a.Quiet = true
 		a.NoColor = true
 	}
-}
 
-// TransformAfterConfigFile same as Transform, but after the config file has been read.
-func (a *Args) TransformAfterConfigFile() {
 	if a.Discovery == "" && a.ServersStr == "" {
-		a.handleEmptyServer()
+		a.Serverless = true
 	}
 }
 
-func (a *Args) handleEmptyServer() {
-	fqdn, err := os.Hostname()
-	if err != nil {
-		logger.FatalExit(err)
-	}
-	a.ServersStr = fmt.Sprintf("%s:%d", fqdn, config.Common.SSHPort)
-	// I am trusting my own hostname.
-	a.TrustAllHosts = true
-	logger.Debug("Will connect to local server", a.ServersStr)
-
-	cleanPath := func(dirtyPath string) string {
-		cleanPath, err := filepath.EvalSymlinks(dirtyPath)
-		if err != nil {
-			logger.FatalExit("Unable to evaluate symlinks", dirtyPath, err)
-		}
-		cleanPath, err = filepath.Abs(cleanPath)
-		if err != nil {
-			logger.FatalExit("Unable to make file path absolute", dirtyPath, cleanPath, err)
-		}
-		return cleanPath
-	}
-
-	logger.Debug("Dirty file paths", a.What)
-	var filePaths []string
-	for _, dirtyPath := range strings.Split(a.What, ",") {
-		filePaths = append(filePaths, cleanPath(dirtyPath))
-	}
-
-	a.What = strings.Join(filePaths, ",")
-	logger.Debug("Clean file paths", a.What)
+// TransformAfterConfigFile same as Transform, but after the config file has been read.
+func (a *Args) TransformAfterConfigFile() {
+	// TODO: Remove this method. It's not used.
 }
 
 func (a *Args) SerializeOptions() string {
-- 
cgit v1.2.3