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/src/logctl | |
| parent | 7b29da0d2943f2aa9e1c6601a538cd4ba0d100be (diff) | |
| parent | 7d665ae3380d013f4b5b8401d8cf239a4e47f51e (diff) | |
Merge branch 'master' into balder/decouple-datatype-and-fiedlvalue-some-more
Diffstat (limited to 'vespalog/src/logctl')
| -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 |
3 files changed, 6 insertions, 4 deletions
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; |