-
Notifications
You must be signed in to change notification settings - Fork 78
[ETCM-107] Backport logging configuration #667
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
src/main/scala/io/iohk/ethereum/utils/LoadFromApplicationConfiguration.scala
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package io.iohk.ethereum.utils | ||
|
|
||
| import ch.qos.logback.core.joran.action.Action | ||
| import ch.qos.logback.core.joran.spi.InterpretationContext | ||
| import com.typesafe.config.ConfigFactory | ||
| import org.xml.sax.Attributes | ||
|
|
||
| /** | ||
| * Make properties defined in application.conf available to logback | ||
| */ | ||
| class LoadFromApplicationConfiguration extends Action { | ||
|
|
||
| val config = ConfigFactory.load | ||
| override def begin(ic: InterpretationContext, body: String, attributes: Attributes): Unit = { | ||
| ic.addSubstitutionProperty(attributes.getValue("as"), config.getString(attributes.getValue("key"))) | ||
| } | ||
| override def end(ic: InterpretationContext, body: String): Unit = () | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,26 @@ | ||
| package io.iohk.ethereum.utils | ||
|
|
||
| import com.typesafe.scalalogging | ||
| import org.slf4j.{LoggerFactory, MDC} | ||
|
|
||
| trait Logger { | ||
| import com.typesafe.scalalogging.Logger | ||
| val log: scalalogging.Logger = com.typesafe.scalalogging.Logger(LoggerFactory.getLogger(getClass)) | ||
| } | ||
|
|
||
| val log = Logger(getClass) | ||
| trait LazyLogger { | ||
| lazy val log: scalalogging.Logger = com.typesafe.scalalogging.Logger(LoggerFactory.getLogger(getClass)) | ||
| } | ||
|
|
||
| trait LoggingContext { | ||
| val asParameterMap: Map[String, String] | ||
| } | ||
|
|
||
| object LoggingContext { | ||
| implicit class ContextLoggerOps[T <: scalalogging.Logger](log: T) { | ||
| def withContext(context: LoggingContext)(doLog: T => Unit): Unit = { | ||
| context.asParameterMap.foreach { case (key, value) => MDC.put(key, value) } | ||
| doLog(log) | ||
| MDC.clear() | ||
| } | ||
| } | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| mantis { | ||
| logging { | ||
| # Flag used to switch logs to the JSON format | ||
| # json-output = false | ||
|
|
||
| # Logs directory | ||
| # logs-dir = ${mantis.datadir}"/logs" | ||
|
|
||
| # Logs filename | ||
| # logs-file = "mantis" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't we expose this config in the universal folder also? Maybe the file
logging.confwill be useful.