File tree Expand file tree Collapse file tree 4 files changed +30
-24
lines changed
core/shared/src/main/scala/org/typelevel/log4cats
main/scala/org/typelevel/log4cats/slf4j
test/scala/org/typelevel/log4cats/slf4j Expand file tree Collapse file tree 4 files changed +30
-24
lines changed Original file line number Diff line number Diff line change @@ -18,13 +18,14 @@ package org.typelevel.log4cats
18
18
19
19
import scala .annotation .implicitNotFound
20
20
21
- @ implicitNotFound(""" |
22
- |Implicit not found for LoggerFactory[${F}].
23
- |
24
- |Information can be found here: https://log4cats.github.io/logging-capability.html
25
- |""" )
21
+ @ implicitNotFound("""
22
+ Implicit not found for LoggerFactory[${F}].
23
+ Information can be found here: https://log4cats.github.io/logging-capability.html
24
+ """ )
26
25
trait LoggerFactory [F [_]] extends LoggerFactoryGen [F , SelfAwareStructuredLogger [F ]]
27
- object LoggerFactory extends LoggerFactoryCompanion
26
+ object LoggerFactory extends LoggerFactoryCompanion {
27
+ def apply [F [_]: LoggerFactory ]: LoggerFactory [F ] = implicitly
28
+ }
28
29
29
30
private [log4cats] trait LoggerFactoryCompanion {
30
31
def getLogger [F [_]](implicit
Original file line number Diff line number Diff line change 14
14
* limitations under the License.
15
15
*/
16
16
17
- package org .typelevel .log4cats .slf4j
17
+ package org .typelevel .log4cats
18
+ package slf4j
18
19
19
- import cats .effect .Sync
20
- import org .typelevel .log4cats .{LoggerFactory , LoggerFactoryCompanion , SelfAwareStructuredLogger }
21
20
import org .slf4j .{Logger => JLogger }
22
21
23
22
trait Slf4jFactory [F [_]] extends LoggerFactory [F ] {
@@ -29,20 +28,6 @@ trait Slf4jFactory[F[_]] extends LoggerFactory[F] {
29
28
object Slf4jFactory extends LoggerFactoryCompanion {
30
29
def apply [F [_]: Slf4jFactory ]: Slf4jFactory [F ] = implicitly
31
30
32
- implicit def forSync [F [_]: Sync ]: Slf4jFactory [F ] = new Slf4jFactory [F ] {
33
- override def getLoggerFromName (name : String ): SelfAwareStructuredLogger [F ] =
34
- Slf4jLogger .getLoggerFromName(name)
35
-
36
- override def getLoggerFromSlf4j (logger : JLogger ): SelfAwareStructuredLogger [F ] =
37
- Slf4jLogger .getLoggerFromSlf4j(logger)
38
-
39
- override def fromName (name : String ): F [SelfAwareStructuredLogger [F ]] =
40
- Slf4jLogger .fromName(name)
41
-
42
- override def fromSlf4j (logger : JLogger ): F [SelfAwareStructuredLogger [F ]] =
43
- Slf4jLogger .fromSlf4j(logger)
44
- }
45
-
46
31
def getLoggerFromSlf4j [F [_]](logger : JLogger )(implicit
47
32
lf : Slf4jFactory [F ]
48
33
): SelfAwareStructuredLogger [F ] = lf.getLoggerFromSlf4j(logger)
Original file line number Diff line number Diff line change
1
+ package org .typelevel .log4cats
2
+
3
+ import cats .effect .Sync
4
+ import org .slf4j .{Logger => JLogger }
5
+
6
+ package object slf4j {
7
+ implicit def loggerFactoryforSync [F [_]: Sync ]: Slf4jFactory [F ] = new Slf4jFactory [F ] {
8
+ override def getLoggerFromName (name : String ): SelfAwareStructuredLogger [F ] =
9
+ Slf4jLogger .getLoggerFromName(name)
10
+
11
+ override def getLoggerFromSlf4j (logger : JLogger ): SelfAwareStructuredLogger [F ] =
12
+ Slf4jLogger .getLoggerFromSlf4j(logger)
13
+
14
+ override def fromName (name : String ): F [SelfAwareStructuredLogger [F ]] =
15
+ Slf4jLogger .fromName(name)
16
+
17
+ override def fromSlf4j (logger : JLogger ): F [SelfAwareStructuredLogger [F ]] =
18
+ Slf4jLogger .fromSlf4j(logger)
19
+ }
20
+ }
Original file line number Diff line number Diff line change @@ -48,7 +48,7 @@ class Slf4jLoggerOuterClassMacroTest {
48
48
49
49
object LoggingBaseline {
50
50
val t = new Throwable
51
- def logger [F [_]: Sync ]: SelfAwareStructuredLogger [F ] = Slf4jLogger .getLogger[F ]
51
+ def logger [F [_]: Sync ]: SelfAwareStructuredLogger [F ] = Slf4jFactory .getLogger[F ]
52
52
53
53
val traceM = logger[IO ].trace(" " )
54
54
val traceTM = logger[IO ].trace(t)(" " )
You can’t perform that action at this time.
0 commit comments