raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Move timestamp formatting to Helpers

Browse source
This commit is contained in:
andrea 2017-05-04 19:42:12 +01:00
parent ef9c7313b6
commit f26a62ae88
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
akka-actor/src/main/scala/akka/event/Logging.scala
View file

@ -3,8 +3,6 @@
*/
package akka.event
import java.time.Instant
import java.time.format.DateTimeFormatter
import java.util.concurrent.TimeoutException
import java.util.concurrent.atomic.AtomicInteger
@ -13,7 +11,7 @@ import akka.actor._
import akka.dispatch.RequiresMessageQueue
import akka.event.Logging._
import akka.util.ReentrantGuard
import akka.util.Helpers.toRootLowerCase
import akka.util.Helpers
import akka.{ AkkaException, ConfigurationException }
import scala.annotation.implicitNotFound
@ -21,8 +19,6 @@ import scala.collection.immutable
import scala.concurrent.Await
import scala.language.existentials
import scala.util.control.{ NoStackTrace, NonFatal }
import java.time.ZoneId
import java.time.LocalDateTime
/**
* This trait brings log level handling to the EventStream: it reads the log
@ -459,7 +455,7 @@ object Logging {
* valid inputs are upper or lowercase (not mixed) versions of:
* "error", "warning", "info" and "debug"
*/
def levelFor(s: String): Option[LogLevel] = toRootLowerCase(s) match {
def levelFor(s: String): Option[LogLevel] = Helpers.toRootLowerCase(s) match {
case "off" ⇒ Some(OffLevel)
case "error" ⇒ Some(ErrorLevel)
case "warning" ⇒ Some(WarningLevel)
@ -865,9 +861,6 @@ object Logging {
*/
class LoggerInitializationException(msg: String) extends AkkaException(msg)
private val formatter = DateTimeFormatter.ofPattern("MM/dd/yyyy HH:mm:ss.SSS")
private val timeZone = ZoneId.systemDefault()
trait StdOutLogger {
import StdOutLogger._
@ -881,9 +874,7 @@ object Logging {
private val debugFormat = DebugFormat
// format: ON
def timestamp(event: LogEvent): String = {
formatter.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(event.timestamp), timeZone))
}
def timestamp(event: LogEvent): String = Helpers.timestamp(event.timestamp)
def print(event: Any): Unit = event match {
case e: Error ⇒ error(e)

9
akka-actor/src/main/scala/akka/util/Helpers.scala
View file

@ -11,6 +11,8 @@ import scala.concurrent.duration.FiniteDuration
import scala.concurrent.duration.Duration
import java.util.concurrent.TimeUnit
import java.util.Locale
import java.time.{ Instant, ZoneId, LocalDateTime }
import java.time.format.DateTimeFormatter
object Helpers {
@ -62,6 +64,13 @@ object Helpers {
f"$hours%02d:$minutes%02d:$seconds%02d.$ms%03dUTC"
}
private val formatter = DateTimeFormatter.ofPattern("MM/dd/yyyy HH:mm:ss.SSS")
private val timeZone = ZoneId.systemDefault()
def timestamp(time: Long): String = {
formatter.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(time), timeZone))
}
final val base64chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+~"
@tailrec