From f1da044c861693359bf9f01a55d63b36c045da4e Mon Sep 17 00:00:00 2001 From: Andras Slemmer Date: Wed, 25 Apr 2018 10:36:40 +0100 Subject: [PATCH 1/2] Remove double wrap --- .../net/corda/node/services/persistence/DBTransactionStorage.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt b/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt index 4dd4d4b8b6..3271208e95 100644 --- a/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt +++ b/node/src/main/kotlin/net/corda/node/services/persistence/DBTransactionStorage.kt @@ -96,7 +96,7 @@ class DBTransactionStorage(cacheSizeBytes: Long) : WritableTransactionStorage, S override fun track(): DataFeed, SignedTransaction> { return txStorage.locked { - DataFeed(allPersisted().map { it.second.toSignedTx() }.toList(), updates.bufferUntilSubscribed().wrapWithDatabaseTransaction()) + DataFeed(allPersisted().map { it.second.toSignedTx() }.toList(), updates.bufferUntilSubscribed()) } } From 29dbe6ab5311594fa0bc24fc533a74423fdaa4fd Mon Sep 17 00:00:00 2001 From: Andras Slemmer Date: Wed, 25 Apr 2018 10:36:50 +0100 Subject: [PATCH 2/2] Add flow-id to MDC --- .../node/services/statemachine/FlowStateMachineImpl.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt b/node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt index aabc75bb4c..b75a68178e 100644 --- a/node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt +++ b/node/src/main/kotlin/net/corda/node/services/statemachine/FlowStateMachineImpl.kt @@ -28,6 +28,7 @@ import net.corda.nodeapi.internal.persistence.contextTransaction import net.corda.nodeapi.internal.persistence.contextTransactionOrNull import org.slf4j.Logger import org.slf4j.LoggerFactory +import org.slf4j.MDC import java.util.concurrent.TimeUnit import kotlin.reflect.KProperty1 @@ -164,11 +165,16 @@ class FlowStateMachineImpl(override val id: StateMachineRunId, } } + fun setLoggingContext() { + context.pushToLoggingContext() + MDC.put("flow-id", id.uuid.toString()) + } + @Suspendable override fun run() { logic.stateMachine = this - context.pushToLoggingContext() + setLoggingContext() initialiseFlow() @@ -321,6 +327,7 @@ class FlowStateMachineImpl(override val id: StateMachineRunId, require(continuation == FlowContinuation.ProcessEvents) Fiber.unparkDeserialized(this, scheduler) } + setLoggingContext() return uncheckedCast(processEventsUntilFlowIsResumed( isDbTransactionOpenOnEntry = false, isDbTransactionOpenOnExit = true