From b0973dd7d17269ad9d4ebfd4842072e739c59eca Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sun, 3 Oct 2021 13:09:32 +0300
Subject: add dmap tests

---
 internal/clients/maprclient.go | 2 +-
 internal/config/common.go      | 1 +
 internal/config/config.go      | 5 ++++-
 internal/config/initializer.go | 6 ++++--
 internal/io/dlog/dlog.go       | 7 +++++--
 5 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'internal')

diff --git a/internal/clients/maprclient.go b/internal/clients/maprclient.go
index f23aa08..19fe119 100644
--- a/internal/clients/maprclient.go
+++ b/internal/clients/maprclient.go
@@ -203,7 +203,7 @@ func (c *MaprClient) printResults() {
 	dlog.Client.Raw(rawQuery)
 
 	if rowsLimit > 0 && numRows > rowsLimit {
-		dlog.Client.Warn(fmt.Sprintf("Got %d results but limited output to %d rows! Use 'limit' clause to override!",
+		dlog.Client.Warn(fmt.Sprintf("Got %d results but limited terminal output to %d rows! Use 'limit' clause to override!",
 			numRows, rowsLimit))
 	}
 	dlog.Client.Raw(result)
diff --git a/internal/config/common.go b/internal/config/common.go
index 255bd28..5e81bc9 100644
--- a/internal/config/common.go
+++ b/internal/config/common.go
@@ -26,6 +26,7 @@ func newDefaultCommonConfig() *CommonConfig {
 		SSHPort:                    DefaultSSHPort,
 		ExperimentalFeaturesEnable: false,
 		LogDir:                     "log",
+		LogLevel:                   "INFO",
 		CacheDir:                   "cache",
 		TmpDir:                     "/tmp",
 	}
diff --git a/internal/config/config.go b/internal/config/config.go
index 09ae994..d58162f 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1,5 +1,7 @@
 package config
 
+import "github.com/mimecast/dtail/internal/source"
+
 const (
 	// ControlUser is used for various DTail specific operations.
 	ControlUser string = "DTAIL-CONTROL"
@@ -25,7 +27,7 @@ var Server *ServerConfig
 var Common *CommonConfig
 
 // Setup the DTail configuration.
-func Setup(args *Args, additionalArgs []string) {
+func Setup(sourceProcess source.Source, args *Args, additionalArgs []string) {
 	initializer := initializer{
 		Common: newDefaultCommonConfig(),
 		Server: newDefaultServerConfig(),
@@ -33,6 +35,7 @@ func Setup(args *Args, additionalArgs []string) {
 	}
 	initializer.parseConfig(args)
 	Client, Server, Common = initializer.transformConfig(
+		sourceProcess,
 		args, additionalArgs,
 		initializer.Client,
 		initializer.Server,
diff --git a/internal/config/initializer.go b/internal/config/initializer.go
index 0e725a6..a58f82a 100644
--- a/internal/config/initializer.go
+++ b/internal/config/initializer.go
@@ -7,6 +7,8 @@ import (
 	"io/ioutil"
 	"os"
 	"strings"
+
+	"github.com/mimecast/dtail/internal/source"
 )
 
 // Used to initialize the configuration.
@@ -56,7 +58,7 @@ func (c *initializer) parseSpecificConfig(configFile string) {
 	}
 }
 
-func (c *initializer) transformConfig(args *Args, additionalArgs []string,
+func (c *initializer) transformConfig(sourceProcess source.Source, args *Args, additionalArgs []string,
 	client *ClientConfig, server *ServerConfig, common *CommonConfig) (*ClientConfig, *ServerConfig, *CommonConfig) {
 	if args.LogDir != "" {
 		common.LogDir = args.LogDir
@@ -85,7 +87,7 @@ func (c *initializer) transformConfig(args *Args, additionalArgs []string,
 
 	if args.LogLevel != "" {
 		common.LogLevel = args.LogLevel
-	} else if args.ServersStr == "" && args.Discovery == "" {
+	} else if sourceProcess == source.Client && args.ServersStr == "" && args.Discovery == "" {
 		// We are in serverless mode. Default log level is WARN.
 		common.LogLevel = "WARN"
 	}
diff --git a/internal/io/dlog/dlog.go b/internal/io/dlog/dlog.go
index 6cacfe2..2beda75 100644
--- a/internal/io/dlog/dlog.go
+++ b/internal/io/dlog/dlog.go
@@ -163,8 +163,11 @@ func (d *DLog) writeArgStrings(sb *strings.Builder, args []interface{}) {
 
 func (d *DLog) FatalPanic(args ...interface{}) {
 	d.log(FATAL, args)
-	d.logger.Flush()
-	panic("Not recovering from this fatal error...")
+	d.Flush()
+
+	var sb strings.Builder
+	d.writeArgStrings(&sb, args)
+	panic(sb.String())
 }
 
 func (d *DLog) Fatal(args ...interface{}) string {
-- 
cgit v1.2.3