From fe3e68afd99d8ea246be52893730f987e138ec24 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sun, 19 Sep 2021 13:22:59 +0300
Subject: move args to config package

logger package rewrite as dlog
---
 docker/.gitignore | 5 -----
 docker/Makefile   | 5 ++++-
 docker/dtail.json | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'docker')

diff --git a/docker/.gitignore b/docker/.gitignore
index ef60a31..e69de29 100644
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -1,5 +0,0 @@
-dserver
-mapr_testdata.log
-log
-*.csv
-*.out
diff --git a/docker/Makefile b/docker/Makefile
index 71fd249..c89467c 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -18,7 +18,10 @@ dgrep:
 	../dgrep --servers serverlist.txt --files '/var/log/dserver/*' --regex MAPREDUCE --trustAllHosts
 dcat:
 	../dcat --servers serverlist.txt --files '/etc/passwd' --trustAllHosts
+dcat_notrust:
+	../dcat --servers serverlist.txt --files '/etc/passwd'
 dcat2:
+	# TODO: All serverless tests in this Makefile have to move to actual unit tests
 	../dcat /etc/passwd
 dmap:
 	../dmap --servers serverlist.txt --files '/var/log/dserver/*' --trustAllHosts --query 'from stats select avg(goroutines),max(goroutines),min(goroutines),last(goroutines),count($$hostname),$$hostname group by $$hostname order by avg(goroutines)'
@@ -30,7 +33,7 @@ dmap2:
 	diff -u <(sort dmap2-A.csv) <(sort dmap2-B.csv)
 	diff -u <(sort dmap2-A.csv) <(sort dmap2-serverless.csv)
 dmap3:
-	../dmap --servers serverlist.txt --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-A.csv'
+	../dmap --servers <(head -n 1 serverlist.txt) --files '/var/log/mapr_testdata.log' --trustAllHosts --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-A.csv'
 	../dmap --query 'from stats select count($$time),last($$time) group by $$time order by count($$time) outfile dmap2-serverless.csv' ./mapr_testdata.log
 	@echo Expecting zero diff!
 	diff -u <(sort dmap2-A.csv) <(sort dmap2-serverless.csv)
diff --git a/docker/dtail.json b/docker/dtail.json
index d923101..badd42f 100644
--- a/docker/dtail.json
+++ b/docker/dtail.json
@@ -33,7 +33,7 @@
     "TmpDir" : "tmp",
     "LogStrategy": "daily",
     "SSHPort": 2222,
-    "DebugEnable": true,
+    "LogLevel": "DEVEL",
     "ExperimentalFeaturesEnable": false
   }
 }
-- 
cgit v1.2.3