diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-07 15:55:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-07 15:55:03 +0200 |
commit | 5c32be88a2a854ad561469feb611e51205c376c7 (patch) | |
tree | 5a79d3bfed05bd2e1347e6056e300b2c028fea9a /vespalog | |
parent | 7b29da0d2943f2aa9e1c6601a538cd4ba0d100be (diff) | |
parent | 7d665ae3380d013f4b5b8401d8cf239a4e47f51e (diff) |
Merge branch 'master' into balder/decouple-datatype-and-fiedlvalue-some-more
Diffstat (limited to 'vespalog')
-rw-r--r-- | vespalog/CMakeLists.txt | 4 | ||||
-rw-r--r-- | vespalog/src/logctl/.gitignore | 2 | ||||
-rw-r--r-- | vespalog/src/logctl/CMakeLists.txt | 4 | ||||
-rw-r--r-- | vespalog/src/logctl/logctl.cpp | 4 | ||||
-rw-r--r-- | vespalog/src/logger/.gitignore | 4 | ||||
-rw-r--r-- | vespalog/src/logger/CMakeLists.txt | 4 | ||||
-rw-r--r-- | vespalog/src/vespa-logfmt/.gitignore (renamed from vespalog/src/logfmt/.gitignore) | 0 | ||||
-rw-r--r-- | vespalog/src/vespa-logfmt/logfilter.c (renamed from vespalog/src/logfmt/logfilter.c) | 0 | ||||
-rw-r--r-- | vespalog/src/vespa-logfmt/vespa-logfmt.1 (renamed from vespalog/src/logfmt/logfmt.1) | 14 | ||||
-rwxr-xr-x | vespalog/src/vespa-logfmt/vespa-logfmt.pl (renamed from vespalog/src/logfmt/logfmt.pl) | 0 |
10 files changed, 19 insertions, 17 deletions
diff --git a/vespalog/CMakeLists.txt b/vespalog/CMakeLists.txt index 17a91b8bbee..d613759e168 100644 --- a/vespalog/CMakeLists.txt +++ b/vespalog/CMakeLists.txt @@ -17,5 +17,5 @@ vespa_define_module( src/test/threads ) -vespa_install_script(src/logfmt/logfmt.pl logfmt bin) -install(FILES src/logfmt/logfmt.1 DESTINATION man/man1) +vespa_install_script(src/vespa-logfmt/vespa-logfmt.pl vespa-logfmt bin) +install(FILES src/vespa-logfmt/vespa-logfmt.1 DESTINATION man/man1) diff --git a/vespalog/src/logctl/.gitignore b/vespalog/src/logctl/.gitignore index 6089704ed9a..92957f69d15 100644 --- a/vespalog/src/logctl/.gitignore +++ b/vespalog/src/logctl/.gitignore @@ -1,3 +1,3 @@ .depend Makefile -logctl +vespa-logctl diff --git a/vespalog/src/logctl/CMakeLists.txt b/vespalog/src/logctl/CMakeLists.txt index 666e840fe60..23e7b6a10e8 100644 --- a/vespalog/src/logctl/CMakeLists.txt +++ b/vespalog/src/logctl/CMakeLists.txt @@ -1,8 +1,8 @@ # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_executable(vespalog_logctl_app +vespa_add_executable(vespalog_vespa-logctl_app SOURCES logctl.cpp - OUTPUT_NAME logctl + OUTPUT_NAME vespa-logctl INSTALL bin DEPENDS vespalog diff --git a/vespalog/src/logctl/logctl.cpp b/vespalog/src/logctl/logctl.cpp index 72891769eee..2bae7c03589 100644 --- a/vespalog/src/logctl/logctl.cpp +++ b/vespalog/src/logctl/logctl.cpp @@ -4,11 +4,13 @@ #include <vespa/log/control-file.h> #include <vespa/log/internal.h> #include <vespa/log/component.h> + #include <unistd.h> #include <dirent.h> #include <sys/stat.h> -LOG_SETUP("logctl", "$Id$"); +LOG_SETUP("vespa-logctl"); + using namespace ns_log; diff --git a/vespalog/src/logger/.gitignore b/vespalog/src/logger/.gitignore index 7cd5c615ee3..a7f5e36f079 100644 --- a/vespalog/src/logger/.gitignore +++ b/vespalog/src/logger/.gitignore @@ -1,5 +1,5 @@ .depend Makefile vespa-runserver -vlogconv -vlogreplay +vespa-log-conv +vespa-log-replay diff --git a/vespalog/src/logger/CMakeLists.txt b/vespalog/src/logger/CMakeLists.txt index 3e055e3b288..dba37539b09 100644 --- a/vespalog/src/logger/CMakeLists.txt +++ b/vespalog/src/logger/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(vespalog_vlogconv_app SOURCES logger.cpp llreader.cpp - OUTPUT_NAME vlogconv + OUTPUT_NAME vespa-log-conv INSTALL bin DEPENDS vespalog @@ -11,7 +11,7 @@ vespa_add_executable(vespalog_vlogconv_app vespa_add_executable(vespalog_vlogreplay_app SOURCES logreplay.c - OUTPUT_NAME vlogreplay + OUTPUT_NAME vespa-log-replay INSTALL bin DEPENDS m diff --git a/vespalog/src/logfmt/.gitignore b/vespalog/src/vespa-logfmt/.gitignore index 568d69eee3e..568d69eee3e 100644 --- a/vespalog/src/logfmt/.gitignore +++ b/vespalog/src/vespa-logfmt/.gitignore diff --git a/vespalog/src/logfmt/logfilter.c b/vespalog/src/vespa-logfmt/logfilter.c index 709ce2c016e..709ce2c016e 100644 --- a/vespalog/src/logfmt/logfilter.c +++ b/vespalog/src/vespa-logfmt/logfilter.c diff --git a/vespalog/src/logfmt/logfmt.1 b/vespalog/src/vespa-logfmt/vespa-logfmt.1 index a16b1ea2eb3..57c8d46370e 100644 --- a/vespalog/src/logfmt/logfmt.1 +++ b/vespalog/src/vespa-logfmt/vespa-logfmt.1 @@ -1,11 +1,11 @@ .\" $Id: logfmt.1,v 1.12 2007-06-19 09:37:25 daljord Exp $ .\" -.Dd October 29, 2004 -.Dt LOGFMT \&1 "Vespa documentation" -.Os "Yahoo! Vespa" "2.0" +.Dd Jun 7, 2017 +.Dt vespa-logfmt \&1 "Vespa documentation" +.Os "Yahoo! Vespa" "6.0" .Os .Sh NAME -.Nm logfmt +.Nm vespa-logfmt .Nd select and format messages from Vespa log files .Sh SYNOPSIS .Nm @@ -68,7 +68,7 @@ is shown. Print the time in human-readable [YYYY-MM-DD HH:mm:ss] format. Note that the time is printed in the local timezone; to get GMT output use -.Nm "\*[q]env TZ=GMT logfmt\*[q]" +.Nm "\*[q]env TZ=GMT vespa-logfmt\*[q]" as your command. .It msecs Add milliseconds after the seconds in @@ -155,7 +155,7 @@ truncating if necessary. The command: .Pp .Bd -literal -offset indent -logfmt -l event -s service,message,fmttime,message +vespa-logfmt -l event -s service,message,fmttime,message .Ed .Pp will display only messages with log level "event", @@ -179,7 +179,7 @@ order is. The command: .Pp .Bd -literal -offset indent -logfmt -l all-info,-debug -s level \e +vespa-logfmt -l all-info,-debug -s level \e -s time,usecs,component,message -t -l -event .Ed .Pp diff --git a/vespalog/src/logfmt/logfmt.pl b/vespalog/src/vespa-logfmt/vespa-logfmt.pl index 8d01feb3a6b..8d01feb3a6b 100755 --- a/vespalog/src/logfmt/logfmt.pl +++ b/vespalog/src/vespa-logfmt/vespa-logfmt.pl |