Skip to content

Commit a3a9968

Browse files
committed
cardano-tracer: forwarding config adoption
1 parent 6abcf0f commit a3a9968

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

cardano-tracer/src/Cardano/Tracer/MetaTrace.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ mkTracerTracer defSeverity = do
186186
initialTraceConfig :: TraceConfig
187187
initialTraceConfig =
188188
TraceConfig
189-
{ tcForwarder = defaultForwarder
189+
{ tcForwarder = Nothing
190190
, tcNodeName = Nothing
191191
, tcPeerFrequency = Nothing
192192
, tcResourceFrequency = Nothing

cardano-tracer/test/cardano-tracer-test-ext.hs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import qualified Data.List as L
1212
import Data.Maybe (fromMaybe)
1313
import Data.Monoid
1414
import qualified System.Directory as Sys
15-
import System.Environment (setEnv, unsetEnv, lookupEnv)
15+
import System.Environment (lookupEnv, setEnv, unsetEnv)
1616
import qualified System.IO as Sys
1717
import System.PosixCompat.Files (fileExist)
1818
import qualified System.Process as Sys
@@ -128,5 +128,6 @@ getExternalTracerState TestSetup{..} ref = do
128128
-- For simplicity, we are always 'Initiator',
129129
-- so 'cardano-tracer' is always a 'Responder'.
130130
let tracerSocketMode = Just (unI tsSockExternal, Initiator)
131-
initForwarding iomgr (tcForwarder simpleTestConfig) (unI tsNetworkMagic) Nothing tracerSocketMode
131+
forwardingConf = fromMaybe defaultForwarder (tcForwarder simpleTestConfig)
132+
initForwarding iomgr forwardingConf (unI tsNetworkMagic) Nothing tracerSocketMode
132133
pure (externalTracerHdl, forwardTracer forwardSink)

0 commit comments

Comments
 (0)