Revert "ETCM-671: replaced actor logging with normal logging"

This reverts commit f8a0631.

Author: bsuieric

src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockFetcher.scala

@@ -1,32 +1,32 @@
 package io.iohk.ethereum.blockchain.sync.regular
 
 import akka.actor.Status.Failure
-import akka.actor.{Actor, ActorRef, Props}
+import akka.actor.{Actor, ActorLogging, ActorRef, Props}
 import akka.pattern.{ask, pipe}
 import akka.util.{ByteString, Timeout}
 import cats.data.NonEmptyList
 import cats.instances.option._
 import cats.syntax.either._
+import io.iohk.ethereum.consensus.validators.BlockValidator
 import io.iohk.ethereum.blockchain.sync.PeersClient._
 import io.iohk.ethereum.blockchain.sync.regular.BlockFetcherState.{
   AwaitingBodiesToBeIgnored,
   AwaitingHeadersToBeIgnored
 }
 import io.iohk.ethereum.blockchain.sync.regular.BlockImporter.{ImportNewBlock, NotOnTop, OnTop}
 import io.iohk.ethereum.blockchain.sync.regular.RegularSync.ProgressProtocol
-import io.iohk.ethereum.consensus.validators.BlockValidator
 import io.iohk.ethereum.crypto.kec256
 import io.iohk.ethereum.domain._
 import io.iohk.ethereum.network.PeerEventBusActor.PeerEvent.MessageFromPeer
 import io.iohk.ethereum.network.PeerEventBusActor.SubscriptionClassifier.MessageClassifier
 import io.iohk.ethereum.network.PeerEventBusActor.{PeerSelector, Subscribe, Unsubscribe}
 import io.iohk.ethereum.network.PeerId
+import io.iohk.ethereum.network.p2p.messages.{Codes, CommonMessages, PV64}
 import io.iohk.ethereum.network.p2p.messages.PV62._
 import io.iohk.ethereum.network.p2p.messages.PV63.{GetNodeData, NodeData}
-import io.iohk.ethereum.network.p2p.messages.{Codes, CommonMessages, PV64}
+import io.iohk.ethereum.utils.ByteStringUtils
 import io.iohk.ethereum.utils.Config.SyncConfig
 import io.iohk.ethereum.utils.FunctorOps._
-import io.iohk.ethereum.utils.{ByteStringUtils, Logger}
 import monix.eval.Task
 import monix.execution.{Scheduler => MonixScheduler}
 import mouse.all._
@@ -40,7 +40,7 @@ class BlockFetcher(
     val syncConfig: SyncConfig,
     val blockValidator: BlockValidator
 ) extends Actor
-    with Logger {
+    with ActorLogging {
 
   import BlockFetcher._
 
@@ -368,7 +368,7 @@ class BlockFetcher(
       .tap(blacklistPeerOnFailedRequest)
       .flatMap(handleRequestResult(responseFallback))
       .onErrorHandle { error =>
-        log.error("Unexpected error while doing a request", error)
+        log.error(error, "Unexpected error while doing a request")
         responseFallback
       }
 
@@ -384,7 +384,7 @@ class BlockFetcher(
     case NoSuitablePeer =>
       Task.now(fallback).delayExecution(syncConfig.syncRetryInterval)
     case Failure(cause) =>
-      log.error("Unexpected error on the request result", cause)
+      log.error(cause, "Unexpected error on the request result")
       Task.now(fallback)
     case m =>
       Task.now(m)

src/main/scala/io/iohk/ethereum/blockchain/sync/regular/BlockImporter.scala

@@ -1,7 +1,7 @@
 package io.iohk.ethereum.blockchain.sync.regular
 
 import akka.actor.Actor.Receive
-import akka.actor.{Actor, ActorRef, NotInfluenceReceiveTimeout, Props, ReceiveTimeout}
+import akka.actor.{Actor, ActorLogging, ActorRef, NotInfluenceReceiveTimeout, Props, ReceiveTimeout}
 import akka.util.ByteString
 import cats.data.NonEmptyList
 import cats.implicits._
@@ -17,7 +17,7 @@ import io.iohk.ethereum.network.PeerId
 import io.iohk.ethereum.ommers.OmmersPool.AddOmmers
 import io.iohk.ethereum.transactions.PendingTransactionsManager
 import io.iohk.ethereum.transactions.PendingTransactionsManager.{AddUncheckedTransactions, RemoveTransactions}
-import io.iohk.ethereum.utils.{ByteStringUtils, Logger}
+import io.iohk.ethereum.utils.ByteStringUtils
 import io.iohk.ethereum.utils.Config.SyncConfig
 import io.iohk.ethereum.utils.FunctorOps._
 import monix.eval.Task
@@ -37,7 +37,7 @@ class BlockImporter(
     checkpointBlockGenerator: CheckpointBlockGenerator,
     supervisor: ActorRef
 ) extends Actor
-    with Logger {
+    with ActorLogging {
   import BlockImporter._
 
   implicit val ec: Scheduler = Scheduler(context.dispatcher)
@@ -247,7 +247,7 @@ class BlockImporter(
       informFetcherOnFail: Boolean,
       internally: Boolean
   ): ImportFn = {
-    def doLog(entry: ImportMessages.LogEntry): Unit = log.info(entry._2)//log.log(entry._1, entry._2)
+    def doLog(entry: ImportMessages.LogEntry): Unit = log.log(entry._1, entry._2)
     importWith(
       {
         Task(doLog(importMessages.preImport()))
@@ -305,7 +305,7 @@ class BlockImporter(
 
     importTask
       .map(self ! ImportDone(_, blockImportType))
-      .onErrorHandle(ex => log.error(ex.getMessage, ex))
+      .onErrorHandle(ex => log.error(ex, ex.getMessage))
       .timed
       .map { case (timeTaken, _) => blockImportType.recordMetric(timeTaken.length) }
       .runAsyncAndForget