Skip to content

Commit 1fe8f0d

Browse files
committed
Remove log4j log supression, Add slf4j log supression
1 parent 6f2646f commit 1fe8f0d

File tree

4 files changed

+11
-33
lines changed

4 files changed

+11
-33
lines changed

bioformats/__init__.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,14 @@
8888
from . import omexml
8989

9090
def init_logger():
91-
javabridge.static_call("org/apache/log4j/BasicConfigurator",
92-
"configure", "()V")
93-
log4j_logger = javabridge.static_call("org/apache/log4j/Logger",
94-
"getRootLogger",
95-
"()Lorg/apache/log4j/Logger;")
96-
warn_level = javabridge.get_static_field("org/apache/log4j/Level", "WARN",
97-
"Lorg/apache/log4j/Level;")
98-
javabridge.call(log4j_logger, "setLevel", "(Lorg/apache/log4j/Level;)V",
99-
warn_level)
91+
rootLoggerName = javabridge.get_static_field("org/slf4j/Logger",
92+
"ROOT_LOGGER_NAME", "Ljava/lang/String;")
93+
rootLogger = javabridge.static_call("org/slf4j/LoggerFactory",
94+
"getLogger", "(Ljava/lang/String;)Lorg/slf4j/Logger;", rootLoggerName)
95+
logLevel = javabridge.get_static_field("ch/qos/logback/classic/Level",
96+
"WARN", "Lch/qos/logback/classic/Level;")
97+
javabridge.call(rootLogger, "setLevel", "(Lch/qos/logback/classic/Level;)V",
98+
logLevel)
10099

101100

102101
if __name__ == "__main__":

bioformats/log4j.py

Lines changed: 0 additions & 19 deletions
This file was deleted.

bioformats/tests/test_formatreader.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@
1616

1717
import javabridge as J
1818
import bioformats.formatreader as F
19-
from bioformats import log4j
2019
import bioformats
2120

2221
class TestFormatReader(unittest.TestCase):
2322
def setUp(self):
2423
J.start_vm(class_path=bioformats.JARS)
2524
J.attach()
26-
log4j.basic_config()
25+
bioformats.init_logger()
2726

2827
def tearDown(self):
2928
J.detach()

bioformats/tests/test_load_using_bioformats.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
import bioformats.formatreader as formatreader
1616
import bioformats.metadatatools as metadatatools
1717
from bioformats import load_image, load_image_url
18-
from bioformats import log4j
1918
import urllib
2019

2120
class TestLoadUsingBioformats(unittest.TestCase):
2221

2322
def setUp(self):
2423
javabridge.attach()
25-
log4j.basic_config()
24+
bioformats.init_logger()
2625

2726
def tearDown(self):
2827
javabridge.detach()
@@ -42,7 +41,7 @@ def test_file_not_found(self):
4241
class TestLoadUsingBioformatsURL(unittest.TestCase):
4342
def setUp(self):
4443
javabridge.attach()
45-
log4j.basic_config()
44+
bioformats.init_logger()
4645

4746
def tearDown(self):
4847
javabridge.detach()

0 commit comments

Comments
 (0)