Skip to content

make all logging in logging trait unsafe #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dvogelbacher wants to merge 1 commit into from
Closed

make all logging in logging trait unsafe #479

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions core/src/main/scala/org/apache/spark/internal/Logging.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import java.util.concurrent.ConcurrentHashMap

import scala.collection.JavaConverters._

import com.palantir.logsafe.UnsafeArg
import org.apache.log4j._
import org.slf4j.{Logger, LoggerFactory}
import org.slf4j.impl.StaticLoggerBinder
Expand Down Expand Up @@ -59,40 +60,40 @@ trait Logging {
}

protected def logDebug(msg: => String) {
if (log.isDebugEnabled) log.debug(msg)
if (log.isDebugEnabled) log.debug("", UnsafeArg.of("msg", msg))
}

protected def logTrace(msg: => String) {
if (log.isTraceEnabled) log.trace(msg)
if (log.isTraceEnabled) log.trace("", UnsafeArg.of("msg", msg))
}

protected def logWarning(msg: => String) {
if (log.isWarnEnabled) log.warn(msg)
if (log.isWarnEnabled) log.warn("", UnsafeArg.of("msg", msg))
}

protected def logError(msg: => String) {
if (log.isErrorEnabled) log.error(msg)
if (log.isErrorEnabled) log.error("", UnsafeArg.of("msg", msg))
}

// Log methods that take Throwables (Exceptions/Errors) too
protected def logInfo(msg: => String, throwable: Throwable) {
if (log.isInfoEnabled) log.info(msg, throwable)
if (log.isInfoEnabled) log.info("", UnsafeArg.of("msg", msg), throwable)
}

protected def logDebug(msg: => String, throwable: Throwable) {
if (log.isDebugEnabled) log.debug(msg, throwable)
if (log.isDebugEnabled) log.debug("", UnsafeArg.of("msg", msg), throwable)
}

protected def logTrace(msg: => String, throwable: Throwable) {
if (log.isTraceEnabled) log.trace(msg, throwable)
if (log.isTraceEnabled) log.trace("", UnsafeArg.of("msg", msg), throwable)
}

protected def logWarning(msg: => String, throwable: Throwable) {
if (log.isWarnEnabled) log.warn(msg, throwable)
if (log.isWarnEnabled) log.warn("", UnsafeArg.of("msg", msg), throwable)
}

protected def logError(msg: => String, throwable: Throwable) {
if (log.isErrorEnabled) log.error(msg, throwable)
if (log.isErrorEnabled) log.error("", UnsafeArg.of("msg", msg), throwable)
}

protected def isTraceEnabled(): Boolean = {
Expand Down