mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-20 19:15:54 +00:00
@@ -458,17 +458,15 @@ public:
|
|||||||
Journal(
|
Journal(
|
||||||
Journal const& other,
|
Journal const& other,
|
||||||
std::optional<JsonLogAttributes> attributes = std::nullopt)
|
std::optional<JsonLogAttributes> attributes = std::nullopt)
|
||||||
: m_sink(other.m_sink)
|
: m_attributes(other.m_attributes)
|
||||||
|
, m_sink(other.m_sink)
|
||||||
{
|
{
|
||||||
if (attributes.has_value())
|
if (attributes.has_value())
|
||||||
m_attributes = std::move(attributes.value());
|
|
||||||
if (other.m_attributes.has_value())
|
|
||||||
{
|
{
|
||||||
if (m_attributes.has_value())
|
if (m_attributes)
|
||||||
m_attributes->combine(
|
m_attributes->combine(attributes->contextValues_);
|
||||||
other.m_attributes->contextValues_);
|
|
||||||
else
|
else
|
||||||
m_attributes = other.m_attributes;
|
m_attributes = std::move(attributes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/** Create a journal that writes to the specified sink. */
|
/** Create a journal that writes to the specified sink. */
|
||||||
|
|||||||
Reference in New Issue
Block a user