summaryrefslogtreecommitdiffstats
path: root/vespalog
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-03-20 11:28:51 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2019-03-20 13:15:39 +0100
commitcddf79bc63fdb5213eed6a51e5fc6c7200539e0f (patch)
tree7a5a6f46a15afa37abf7c8a79903cf4ae0c26bfd /vespalog
parentb5ffed4ce1dcad6a3c1e206c4357f95740ad8e7b (diff)
Remove replicator plugin from logserver
Diffstat (limited to 'vespalog')
-rw-r--r--vespalog/src/vespa-logfmt/vespa-logfmt.15
-rwxr-xr-xvespalog/src/vespa-logfmt/vespa-logfmt.pl9
2 files changed, 2 insertions, 12 deletions
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 ) {