Skip to content

Commit 4c99314

Browse files
eugeniykanalytically
eugeniyk
authored and
analytically
committed
Use marker inside macros in *Enabled methods (#140)
1 parent 44308c5 commit 4c99314

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

‎src/main/scala/com/typesafe/scalalogging/LoggerMacro.scala

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,17 @@ private object LoggerMacro {
5454
def errorMessageCauseMarker(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]): c.universe.Tree = {
5555
import c.universe._
5656
val underlying = q"${c.prefix}.underlying"
57-
q"if ($underlying.isErrorEnabled) $underlying.error($marker, $message, $cause)"
57+
q"if ($underlying.isErrorEnabled($marker)) $underlying.error($marker, $message, $cause)"
5858
}
5959

6060
def errorMessageArgsMarker(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], args: c.Expr[Any]*): c.universe.Tree = {
6161
import c.universe._
6262
val underlying = q"${c.prefix}.underlying"
6363
val anyRefArgs = formatArgs(c)(args: _*)
6464
if (args.length == 2)
65-
q"if ($underlying.isErrorEnabled) $underlying.error($marker, $message, _root_.scala.Array(${anyRefArgs.head}, ${anyRefArgs(1)}): _*)"
65+
q"if ($underlying.isErrorEnabled($marker)) $underlying.error($marker, $message, _root_.scala.Array(${anyRefArgs.head}, ${anyRefArgs(1)}): _*)"
6666
else
67-
q"if ($underlying.isErrorEnabled) $underlying.error($marker, $message, ..$anyRefArgs)"
67+
q"if ($underlying.isErrorEnabled($marker)) $underlying.error($marker, $message, ..$anyRefArgs)"
6868
}
6969

7070
def errorCode(c: LoggerContext)(body: c.Expr[Unit]): c.universe.Tree = {
@@ -104,17 +104,17 @@ private object LoggerMacro {
104104
def warnMessageCauseMarker(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]): c.universe.Tree = {
105105
import c.universe._
106106
val underlying = q"${c.prefix}.underlying"
107-
q"if ($underlying.isWarnEnabled) $underlying.warn($marker, $message, $cause)"
107+
q"if ($underlying.isWarnEnabled($marker)) $underlying.warn($marker, $message, $cause)"
108108
}
109109

110110
def warnMessageArgsMarker(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], args: c.Expr[Any]*): c.universe.Tree = {
111111
import c.universe._
112112
val underlying = q"${c.prefix}.underlying"
113113
val anyRefArgs = formatArgs(c)(args: _*)
114114
if (args.length == 2)
115-
q"if ($underlying.isWarnEnabled) $underlying.warn($marker, $message, _root_.scala.Array(${anyRefArgs.head}, ${anyRefArgs(1)}): _*)"
115+
q"if ($underlying.isWarnEnabled($marker)) $underlying.warn($marker, $message, _root_.scala.Array(${anyRefArgs.head}, ${anyRefArgs(1)}): _*)"
116116
else
117-
q"if ($underlying.isWarnEnabled) $underlying.warn($marker, $message, ..$anyRefArgs)"
117+
q"if ($underlying.isWarnEnabled($marker)) $underlying.warn($marker, $message, ..$anyRefArgs)"
118118
}
119119

120120
def warnCode(c: LoggerContext)(body: c.Expr[Unit]): c.universe.Tree = {
@@ -154,17 +154,17 @@ private object LoggerMacro {
154154
def infoMessageCauseMarker(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]): c.universe.Tree = {
155155
import c.universe._
156156
val underlying = q"${c.prefix}.underlying"
157-
q"if ($underlying.isInfoEnabled) $underlying.info($marker, $message, $cause)"
157+
q"if ($underlying.isInfoEnabled($marker)) $underlying.info($marker, $message, $cause)"
158158
}
159159

160160
def infoMessageArgsMarker(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], args: c.Expr[Any]*): c.universe.Tree = {
161161
import c.universe._
162162
val underlying = q"${c.prefix}.underlying"
163163
val anyRefArgs = formatArgs(c)(args: _*)
164164
if (args.length == 2)
165-
q"if ($underlying.isInfoEnabled) $underlying.info($marker, $message, _root_.scala.Array(${anyRefArgs.head}, ${anyRefArgs(1)}): _*)"
165+
q"if ($underlying.isInfoEnabled($marker)) $underlying.info($marker, $message, _root_.scala.Array(${anyRefArgs.head}, ${anyRefArgs(1)}): _*)"
166166
else
167-
q"if ($underlying.isInfoEnabled) $underlying.info($marker, $message, ..$anyRefArgs)"
167+
q"if ($underlying.isInfoEnabled($marker)) $underlying.info($marker, $message, ..$anyRefArgs)"
168168
}
169169

170170
def infoCode(c: LoggerContext)(body: c.Expr[Unit]): c.universe.Tree = {
@@ -204,17 +204,17 @@ private object LoggerMacro {
204204
def debugMessageCauseMarker(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]): c.universe.Tree = {
205205
import c.universe._
206206
val underlying = q"${c.prefix}.underlying"
207-
q"if ($underlying.isDebugEnabled) $underlying.debug($marker, $message, $cause)"
207+
q"if ($underlying.isDebugEnabled($marker)) $underlying.debug($marker, $message, $cause)"
208208
}
209209

210210
def debugMessageArgsMarker(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], args: c.Expr[Any]*): c.universe.Tree = {
211211
import c.universe._
212212
val underlying = q"${c.prefix}.underlying"
213213
val anyRefArgs = formatArgs(c)(args: _*)
214214
if (args.length == 2)
215-
q"if ($underlying.isDebugEnabled) $underlying.debug($marker, $message, _root_.scala.Array(${anyRefArgs.head}, ${anyRefArgs(1)}): _*)"
215+
q"if ($underlying.isDebugEnabled($marker)) $underlying.debug($marker, $message, _root_.scala.Array(${anyRefArgs.head}, ${anyRefArgs(1)}): _*)"
216216
else
217-
q"if ($underlying.isDebugEnabled) $underlying.debug($marker, $message, ..$anyRefArgs)"
217+
q"if ($underlying.isDebugEnabled($marker)) $underlying.debug($marker, $message, ..$anyRefArgs)"
218218
}
219219

220220
def debugCode(c: LoggerContext)(body: c.Expr[Unit]): c.universe.Tree = {
@@ -254,17 +254,17 @@ private object LoggerMacro {
254254
def traceMessageCauseMarker(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], cause: c.Expr[Throwable]): c.universe.Tree = {
255255
import c.universe._
256256
val underlying = q"${c.prefix}.underlying"
257-
q"if ($underlying.isTraceEnabled) $underlying.trace($marker, $message, $cause)"
257+
q"if ($underlying.isTraceEnabled($marker)) $underlying.trace($marker, $message, $cause)"
258258
}
259259

260260
def traceMessageArgsMarker(c: LoggerContext)(marker: c.Expr[Marker], message: c.Expr[String], args: c.Expr[Any]*): c.universe.Tree = {
261261
import c.universe._
262262
val underlying = q"${c.prefix}.underlying"
263263
val anyRefArgs = formatArgs(c)(args: _*)
264264
if (args.length == 2)
265-
q"if ($underlying.isTraceEnabled) $underlying.trace($marker, $message, _root_.scala.Array(${anyRefArgs.head}, ${anyRefArgs(1)}): _*)"
265+
q"if ($underlying.isTraceEnabled($marker)) $underlying.trace($marker, $message, _root_.scala.Array(${anyRefArgs.head}, ${anyRefArgs(1)}): _*)"
266266
else
267-
q"if ($underlying.isTraceEnabled) $underlying.trace($marker, $message, ..$anyRefArgs)"
267+
q"if ($underlying.isTraceEnabled($marker)) $underlying.trace($marker, $message, ..$anyRefArgs)"
268268
}
269269

270270
def traceCode(c: LoggerContext)(body: c.Expr[Unit]): c.universe.Tree = {

‎src/main/scala/com/typesafe/scalalogging/LoggerTakingImplicitMacro.scala

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private object LoggerTakingImplicitMacro {
5050
import c.universe._
5151
val underlying = q"${c.prefix}.underlying"
5252
val canLogEv = q"${c.prefix}.canLogEv"
53-
q"""if ($underlying.isErrorEnabled) {
53+
q"""if ($underlying.isErrorEnabled($marker)) {
5454
$underlying.error($marker, $canLogEv.logMessage($message, $a))
5555
$canLogEv.afterLog($a)
5656
}"""
@@ -60,7 +60,7 @@ private object LoggerTakingImplicitMacro {
6060
import c.universe._
6161
val underlying = q"${c.prefix}.underlying"
6262
val canLogEv = q"${c.prefix}.canLogEv"
63-
q"""if ($underlying.isErrorEnabled) {
63+
q"""if ($underlying.isErrorEnabled($marker)) {
6464
$underlying.error($marker, $canLogEv.logMessage($message, $a), $cause)
6565
$canLogEv.afterLog($a)
6666
}"""
@@ -71,12 +71,12 @@ private object LoggerTakingImplicitMacro {
7171
val underlying = q"${c.prefix}.underlying"
7272
val canLogEv = q"${c.prefix}.canLogEv"
7373
if (args.length == 2) {
74-
q"""if ($underlying.isErrorEnabled) {
74+
q"""if ($underlying.isErrorEnabled($marker)) {
7575
$underlying.error($marker, $canLogEv.logMessage($message, $a), List(${args(0)}, ${args(1)}): _*)
7676
$canLogEv.afterLog($a)
7777
}"""
7878
} else {
79-
q"""if ($underlying.isErrorEnabled) {
79+
q"""if ($underlying.isErrorEnabled($marker)) {
8080
$underlying.error($marker, $canLogEv.logMessage($message, $a), ..$args)
8181
$canLogEv.afterLog($a)
8282
}"""
@@ -126,7 +126,7 @@ private object LoggerTakingImplicitMacro {
126126
import c.universe._
127127
val underlying = q"${c.prefix}.underlying"
128128
val canLogEv = q"${c.prefix}.canLogEv"
129-
q"""if ($underlying.isWarnEnabled) {
129+
q"""if ($underlying.isWarnEnabled($marker)) {
130130
$underlying.warn($marker, $canLogEv.logMessage($message, $a))
131131
$canLogEv.afterLog($a)
132132
}"""
@@ -136,7 +136,7 @@ private object LoggerTakingImplicitMacro {
136136
import c.universe._
137137
val underlying = q"${c.prefix}.underlying"
138138
val canLogEv = q"${c.prefix}.canLogEv"
139-
q"""if ($underlying.isWarnEnabled) {
139+
q"""if ($underlying.isWarnEnabled($marker)) {
140140
$underlying.warn($marker, $canLogEv.logMessage($message, $a), $cause)
141141
$canLogEv.afterLog($a)
142142
}"""
@@ -147,12 +147,12 @@ private object LoggerTakingImplicitMacro {
147147
val underlying = q"${c.prefix}.underlying"
148148
val canLogEv = q"${c.prefix}.canLogEv"
149149
if (args.length == 2) {
150-
q"""if ($underlying.isWarnEnabled) {
150+
q"""if ($underlying.isWarnEnabled($marker)) {
151151
$underlying.warn($marker, $canLogEv.logMessage($message, $a), List(${args(0)}, ${args(1)}): _*)
152152
$canLogEv.afterLog($a)
153153
}"""
154154
} else {
155-
q"""if ($underlying.isWarnEnabled) {
155+
q"""if ($underlying.isWarnEnabled($marker)) {
156156
$underlying.warn($marker, $canLogEv.logMessage($message, $a), ..$args)
157157
$canLogEv.afterLog($a)
158158
}"""
@@ -202,7 +202,7 @@ private object LoggerTakingImplicitMacro {
202202
import c.universe._
203203
val underlying = q"${c.prefix}.underlying"
204204
val canLogEv = q"${c.prefix}.canLogEv"
205-
q"""if ($underlying.isInfoEnabled) {
205+
q"""if ($underlying.isInfoEnabled($marker)) {
206206
$underlying.info($marker, $canLogEv.logMessage($message, $a))
207207
$canLogEv.afterLog($a)
208208
}"""
@@ -212,7 +212,7 @@ private object LoggerTakingImplicitMacro {
212212
import c.universe._
213213
val underlying = q"${c.prefix}.underlying"
214214
val canLogEv = q"${c.prefix}.canLogEv"
215-
q"""if ($underlying.isInfoEnabled) {
215+
q"""if ($underlying.isInfoEnabled($marker)) {
216216
$underlying.info($marker, $canLogEv.logMessage($message, $a), $cause)
217217
$canLogEv.afterLog($a)
218218
}"""
@@ -223,12 +223,12 @@ private object LoggerTakingImplicitMacro {
223223
val underlying = q"${c.prefix}.underlying"
224224
val canLogEv = q"${c.prefix}.canLogEv"
225225
if (args.length == 2) {
226-
q"""if ($underlying.isInfoEnabled) {
226+
q"""if ($underlying.isInfoEnabled($marker)) {
227227
$underlying.info($marker, $canLogEv.logMessage($message, $a), List(${args(0)}, ${args(1)}): _*)
228228
$canLogEv.afterLog($a)
229229
}"""
230230
} else {
231-
q"""if ($underlying.isInfoEnabled) {
231+
q"""if ($underlying.isInfoEnabled($marker)) {
232232
$underlying.info($marker, $canLogEv.logMessage($message, $a), ..$args)
233233
$canLogEv.afterLog($a)
234234
}"""
@@ -278,7 +278,7 @@ private object LoggerTakingImplicitMacro {
278278
import c.universe._
279279
val underlying = q"${c.prefix}.underlying"
280280
val canLogEv = q"${c.prefix}.canLogEv"
281-
q"""if ($underlying.isDebugEnabled) {
281+
q"""if ($underlying.isDebugEnabled($marker)) {
282282
$underlying.debug($marker, $canLogEv.logMessage($message, $a))
283283
$canLogEv.afterLog($a)
284284
}"""
@@ -288,7 +288,7 @@ private object LoggerTakingImplicitMacro {
288288
import c.universe._
289289
val underlying = q"${c.prefix}.underlying"
290290
val canLogEv = q"${c.prefix}.canLogEv"
291-
q"""if ($underlying.isDebugEnabled) {
291+
q"""if ($underlying.isDebugEnabled($marker)) {
292292
$underlying.debug($marker, $canLogEv.logMessage($message, $a), $cause)
293293
$canLogEv.afterLog($a)
294294
}"""
@@ -299,12 +299,12 @@ private object LoggerTakingImplicitMacro {
299299
val underlying = q"${c.prefix}.underlying"
300300
val canLogEv = q"${c.prefix}.canLogEv"
301301
if (args.length == 2) {
302-
q"""if ($underlying.isDebugEnabled) {
302+
q"""if ($underlying.isDebugEnabled($marker)) {
303303
$underlying.debug($marker, $canLogEv.logMessage($message, $a), List(${args(0)}, ${args(1)}): _*)
304304
$canLogEv.afterLog($a)
305305
}"""
306306
} else {
307-
q"""if ($underlying.isDebugEnabled) {
307+
q"""if ($underlying.isDebugEnabled($marker)) {
308308
$underlying.debug($marker, $canLogEv.logMessage($message, $a), ..$args)
309309
$canLogEv.afterLog($a)
310310
}"""
@@ -354,7 +354,7 @@ private object LoggerTakingImplicitMacro {
354354
import c.universe._
355355
val underlying = q"${c.prefix}.underlying"
356356
val canLogEv = q"${c.prefix}.canLogEv"
357-
q"""if ($underlying.isTraceEnabled) {
357+
q"""if ($underlying.isTraceEnabled($marker)) {
358358
$underlying.trace($marker, $canLogEv.logMessage($message, $a))
359359
$canLogEv.afterLog($a)
360360
}"""
@@ -364,7 +364,7 @@ private object LoggerTakingImplicitMacro {
364364
import c.universe._
365365
val underlying = q"${c.prefix}.underlying"
366366
val canLogEv = q"${c.prefix}.canLogEv"
367-
q"""if ($underlying.isTraceEnabled) {
367+
q"""if ($underlying.isTraceEnabled($marker)) {
368368
$underlying.trace($marker, $canLogEv.logMessage($message, $a), $cause)
369369
$canLogEv.afterLog($a)
370370
}"""
@@ -375,12 +375,12 @@ private object LoggerTakingImplicitMacro {
375375
val underlying = q"${c.prefix}.underlying"
376376
val canLogEv = q"${c.prefix}.canLogEv"
377377
if (args.length == 2) {
378-
q"""if ($underlying.isTraceEnabled) {
378+
q"""if ($underlying.isTraceEnabled($marker)) {
379379
$underlying.trace($marker, $canLogEv.logMessage($message, $a), List(${args(0)}, ${args(1)}): _*)
380380
$canLogEv.afterLog($a)
381381
}"""
382382
} else {
383-
q"""if ($underlying.isTraceEnabled) {
383+
q"""if ($underlying.isTraceEnabled($marker)) {
384384
$underlying.trace($marker, $canLogEv.logMessage($message, $a), ..$args)
385385
$canLogEv.afterLog($a)
386386
}"""

‎src/test/scala/com/typesafe/scalalogging/LoggerWithMarkerSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ class LoggerWithMarkerSpec extends WordSpec with Matchers with MockitoSugar {
381381
}
382382
}
383383

384-
def fixture(p: Underlying => Boolean, isEnabled: Boolean) =
384+
def fixture(p: Underlying => Marker => Boolean, isEnabled: Boolean) =
385385
new {
386386
val marker = DummyMarker
387387
val msg = "msg"
@@ -390,7 +390,7 @@ class LoggerWithMarkerSpec extends WordSpec with Matchers with MockitoSugar {
390390
val arg2 = new Integer(1)
391391
val arg3 = "arg3"
392392
val underlying = mock[org.slf4j.Logger]
393-
when(p(underlying)).thenReturn(isEnabled)
393+
when(p(underlying)(marker)).thenReturn(isEnabled)
394394
val logger = Logger(underlying)
395395
}
396396
}

0 commit comments

Comments
 (0)