We only need one vtag

5 files changed, 7 insertions, 39 deletions

diff --git a/logd/src/logd/CMakeLists.txt b/logd/src/logd/CMakeLists.txt
index 3c0f7bacd33..81aa64641b2 100644
--- a/logd/src/logd/CMakeLists.txt
+++ b/logd/src/logd/CMakeLists.txt
@@ -9,7 +9,6 @@ vespa_add_library(logd STATIC
     cmdbuf.cpp
     perform.cpp
     sigterm.cpp
-    vtag.cpp
     DEPENDS
 )
 vespa_generate_config(logd ../main/resources/configdefinitions/logd.def)
diff --git a/logd/src/logd/forward.cpp b/logd/src/logd/forward.cpp
index 373f95ab742..e4c86583fc0 100644
--- a/logd/src/logd/forward.cpp
+++ b/logd/src/logd/forward.cpp
@@ -7,15 +7,14 @@
 #include <unistd.h>
 #include <time.h>
 #include <assert.h>
-
-#include <vespa/log/log.h>
-LOG_SETUP("");
-LOG_RCSID("$Id$");
-
 #include "errhandle.h"
 #include "service.h"
 #include "forward.h"
-#include "vtag.h"
+#include <vespa/vespalib/component/vtag.h>
+#include <vespa/log/log.h>
+
+LOG_SETUP("");
+LOG_RCSID("$Id$");
 
 namespace logdemon {
 
@@ -40,7 +39,7 @@ void
 Forwarder::sendMode()
 {
     char buf[1024];
-    snprintf(buf, 1024, "mode logd %s\n", VersionTag);
+    snprintf(buf, 1024, "mode logd %s\n", vespalib::VersionTag);
     int len = strlen(buf);
     if (len < 100) {
             forwardText(buf, len);
diff --git a/logd/src/logd/service.h b/logd/src/logd/service.h
index a6d6ca4ff60..700ab85fe27 100644
--- a/logd/src/logd/service.h
+++ b/logd/src/logd/service.h
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include <logd/config-logd.h>
 #include <vespa/vespalib/util/hashmap.h>
+#include <vespa/log/log.h>
 
 namespace logdemon {
 
diff --git a/logd/src/logd/vtag.cpp b/logd/src/logd/vtag.cpp
deleted file mode 100644
index 17b677d4662..00000000000
--- a/logd/src/logd/vtag.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-namespace logdemon {
-
-#ifndef V_TAG
-#define V_TAG "NOTAG"
-#define V_TAG_DATE "NOTAG"
-#define V_TAG_SYSTEM "NOTAG"
-#define V_TAG_SYSTEM_REV "NOTAG"
-#define V_TAG_BUILDER "NOTAG"
-#endif
-
-char VersionTag[] = V_TAG;
-char VersionTagDate[] = V_TAG_DATE;
-char VersionTagSystem[] = V_TAG_SYSTEM;
-char VersionTagSystemRev[] = V_TAG_SYSTEM_REV;
-char VersionTagBuilder[] = V_TAG_BUILDER;
-
-} // namespace logdemon
diff --git a/logd/src/logd/vtag.h b/logd/src/logd/vtag.h
deleted file mode 100644
index 7c78914829e..00000000000
--- a/logd/src/logd/vtag.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-namespace logdemon {
-
-extern char VersionTag[];
-extern char VersionTagDate[];
-extern char VersionTagSystem[];
-extern char VersionTagSystemRev[];
-extern char VersionTagBuilder[];
-
-}
-