From cddf79bc63fdb5213eed6a51e5fc6c7200539e0f Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Wed, 20 Mar 2019 11:28:51 +0100
Subject: Remove replicator plugin from logserver

---
 vespalog/src/vespa-logfmt/vespa-logfmt.1  | 5 -----
 vespalog/src/vespa-logfmt/vespa-logfmt.pl | 9 ++-------
 2 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'vespalog/src')

diff --git a/vespalog/src/vespa-logfmt/vespa-logfmt.1 b/vespalog/src/vespa-logfmt/vespa-logfmt.1
index cb6f0e89642..b6a5ec0164d 100644
--- a/vespalog/src/vespa-logfmt/vespa-logfmt.1
+++ b/vespalog/src/vespa-logfmt/vespa-logfmt.1
@@ -134,11 +134,6 @@ given, using
 regular expression matching.
 .It Fl f
 Invoke tail -F to follow input file
-.It Fl L
-.It Fl -livestream
-Only useful for multi-machine setups:
-Invoke vespa-replicate-log-stream to follow live stream from log server,
-instead of reading any input file.  Also implies
 .Bk
 .Fl "s +host"
 .Ek
diff --git a/vespalog/src/vespa-logfmt/vespa-logfmt.pl b/vespalog/src/vespa-logfmt/vespa-logfmt.pl
index b5ed43e434a..eed53af8923 100755
--- a/vespalog/src/vespa-logfmt/vespa-logfmt.pl
+++ b/vespalog/src/vespa-logfmt/vespa-logfmt.pl
@@ -59,7 +59,6 @@ my @optshow;
 my $optlevels;
 my $optfollow;
 my $optnldequote;
-my $optreplication;
 my $opthelp = '';
 
 my $bad = 0;
@@ -72,18 +71,14 @@ GetOptions ('level|l=s' => \@optlevels,
             'message|m=s'  => \$msgtxre,
             'help|h' => \$opthelp,
             'follow|f' => \$optfollow,
-            'livestream|L' => \$optreplication,
             'nldequote|N' => \$optnldequote,
             'host|H=s' => \$onlyhst,
             'truncateservice|ts' => \$shortsvc,
             'truncatecomponent|tc|t' => \$shortcmp,
 ) or $bad=1;
 
-if ( $optreplication ) {
-        open(STDIN, "vespa-replicate-log-stream |");
-        $showflags{'host'} = 1;
-} elsif ( @ARGV == 0 and ! -p STDIN) {
-        push(@ARGV, "$VESPA_HOME/logs/vespa/vespa.log");
+if ( @ARGV == 0 and ! -p STDIN) {
+    push(@ARGV, "$VESPA_HOME/logs/vespa/vespa.log");
 }
 
 if ( $optfollow ) {
-- 
cgit v1.2.3