Skip to content

Commit fb1e41a

Browse files
authored
fix: Use CompositeFilter for console logging (#19171)
Signed-off-by: Timo Brandstätter <[email protected]>
1 parent ef09fa9 commit fb1e41a

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

platform-sdk/consensus-otter-tests/src/testFixtures/java/org/hiero/otter/fixtures/turtle/TurtleTestEnvironment.java

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// SPDX-License-Identifier: Apache-2.0
22
package org.hiero.otter.fixtures.turtle;
33

4+
import static com.swirlds.logging.legacy.LogMarker.STATE_HASH;
45
import static com.swirlds.platform.test.fixtures.state.TestingAppStateInitializer.registerMerkleStateRootClassIds;
56

67
import com.swirlds.base.test.fixtures.time.FakeTime;
@@ -22,7 +23,6 @@
2223
import org.apache.logging.log4j.core.config.Configuration;
2324
import org.apache.logging.log4j.core.config.LoggerConfig;
2425
import org.apache.logging.log4j.core.filter.MarkerFilter;
25-
import org.apache.logging.log4j.core.filter.NoMarkerFilter;
2626
import org.apache.logging.log4j.core.layout.PatternLayout;
2727
import org.hiero.base.constructable.ConstructableRegistry;
2828
import org.hiero.base.constructable.ConstructableRegistryException;
@@ -117,13 +117,8 @@ private static void initLogging() {
117117
.setTarget(ConsoleAppender.Target.SYSTEM_OUT)
118118
.build();
119119

120-
final NoMarkerFilter markerExistsFilter = NoMarkerFilter.newBuilder()
121-
.setOnMatch(Result.DENY)
122-
.setOnMismatch(Result.ACCEPT)
123-
.build();
124-
consoleAppender.addFilter(markerExistsFilter);
125-
126-
final MarkerFilter noStateHashFilter = MarkerFilter.createFilter("STATE_HASH", Result.DENY, Result.NEUTRAL);
120+
final MarkerFilter noStateHashFilter =
121+
MarkerFilter.createFilter(STATE_HASH.name(), Result.DENY, Result.NEUTRAL);
127122
consoleAppender.addFilter(noStateHashFilter);
128123

129124
consoleAppender.start();
@@ -148,7 +143,7 @@ private static void initLogging() {
148143

149144
// Accept only logs with marker STATE_HASH
150145
final MarkerFilter onlyStateHashFilter =
151-
MarkerFilter.createFilter("STATE_HASH", Result.ACCEPT, Result.DENY);
146+
MarkerFilter.createFilter(STATE_HASH.name(), Result.ACCEPT, Result.DENY);
152147
stateHashFileAppender.addFilter(onlyStateHashFilter);
153148

154149
stateHashFileAppender.start();

0 commit comments

Comments
 (0)