summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Venture <venture@google.com>2019-01-03 14:31:09 -0800
committerPatrick Venture <venture@google.com>2019-01-03 14:33:14 -0800
commit3f9cb09427ddb0d4e885db2f81da65b724e0285e (patch)
treecaf9d142c9bee6dc99e162445568cdddab34af4b
parent31552c05e2b7066e923389dc4bba421d0fbcf2df (diff)
downloadphosphor-logging-3f9cb09427ddb0d4e885db2f81da65b724e0285e.zip
phosphor-logging-3f9cb09427ddb0d4e885db2f81da65b724e0285e.tar.gz
disable journal interface call-through
The pass-through isn't working as expected, therefore disable it. This patchset disables the call to the sd journal interface object and instead calls sdbus directly as it had previously. This will break any tests that pass through log<>, but that will be revisited. Change-Id: I59aa914d21405a2c5b9746d7d98958912078cc87 Signed-off-by: Patrick Venture <venture@google.com>
-rw-r--r--phosphor-logging/log.hpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/phosphor-logging/log.hpp b/phosphor-logging/log.hpp
index 673848c..24fa423 100644
--- a/phosphor-logging/log.hpp
+++ b/phosphor-logging/log.hpp
@@ -100,7 +100,9 @@ template <typename T, size_t... I>
void helper_log(T&& e, std::integer_sequence<size_t, I...>)
{
// https://www.freedesktop.org/software/systemd/man/sd_journal_print.html
- sdjournal_ptr->journal_send(std::get<I>(std::forward<T>(e))..., NULL);
+ // TODO: Re-enable call through interface for testing (or move the code
+ // into the body of the object).
+ sd_journal_send(std::get<I>(std::forward<T>(e))..., NULL);
}
/** @fn details::log()
OpenPOWER on IntegriCloud