Merge pull request #64 from yahoo/geirst/tls-fixes-and-metrics

Geirst/tls fixes and metrics

2 files changed, 5 insertions, 2 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp
index 606312fcae2..06a20e8da78 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp
+++ b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.cpp
@@ -12,14 +12,16 @@ TransLogServerMetrics::DomainMetrics::DomainMetrics(metrics::MetricSet *parent,
                                                     const vespalib::string &documentType)
     : metrics::MetricSet("transactionlog", {{"documenttype", documentType}},
             "Transaction log metrics for a document type", parent),
-      entries("entries", "", "The current number of entries in the transaction log", this)
+      entries("entries", "", "The current number of entries in the transaction log", this),
+      diskUsage("disk_usage", "", "The disk usage (in bytes) of the transaction log", this)
 {
 }
 
 void
 TransLogServerMetrics::DomainMetrics::update(const DomainInfo &stats)
 {
-    entries.set(stats.count);
+    entries.set(stats.numEntries);
+    diskUsage.set(stats.byteSize);
 }
 
 void
diff --git a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h
index 0d52f6cf0d1..4a7241bbef7 100644
--- a/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h
+++ b/searchcore/src/vespa/searchcore/proton/metrics/trans_log_server_metrics.h
@@ -16,6 +16,7 @@ public:
     struct DomainMetrics : public metrics::MetricSet
     {
         metrics::LongValueMetric entries;
+        metrics::LongValueMetric diskUsage;
 
         typedef std::unique_ptr<DomainMetrics> UP;
         DomainMetrics(metrics::MetricSet *parent, const vespalib::string &documentType);