Merge pull request #100 from delphi-hub/feature/harmonizeLogs

Harmonized logging output

Author: johannesduesing

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/DockerActor.scala

@@ -1,15 +1,13 @@
 package de.upb.cs.swt.delphi.instanceregistry.Docker
 
 import akka.actor.{Actor, ActorLogging, ActorSystem, Props, Status}
-import akka.http.scaladsl.model.ws.Message
 import akka.stream.ActorMaterializer
 import de.upb.cs.swt.delphi.instanceregistry.Docker.DockerActor._
 import de.upb.cs.swt.delphi.instanceregistry.Registry
 import de.upb.cs.swt.delphi.instanceregistry.io.swagger.client.model.InstanceEnums.ComponentType
-import org.reactivestreams.Publisher
 
 import scala.concurrent.duration._
-import scala.concurrent.{Await, ExecutionContext, Future}
+import scala.concurrent.{Await, ExecutionContext}
 import scala.util.{Failure, Success, Try}
 
 class DockerActor(connection: DockerConnection) extends Actor with ActorLogging {
@@ -27,13 +25,13 @@ class DockerActor(connection: DockerConnection) extends Actor with ActorLogging
   def receive: PartialFunction[Any, Unit] = {
 
     case start(containerId) =>
-      log.info(s"Docker Container started")
-     Try(Await.result(container.start(containerId), Duration.Inf)) match {
-       case Success(_) =>
-         sender ! Status.Success
-       case Failure(ex) =>
-         sender ! Status.Failure(ex)
-     }
+      log.debug(s"Docker Container started")
+      Try(Await.result(container.start(containerId), Duration.Inf)) match {
+        case Success(_) =>
+          sender ! Status.Success
+        case Failure(ex) =>
+          sender ! Status.Failure(ex)
+      }
 
     case create(componentType, instanceId, containerName) =>
 
@@ -74,7 +72,7 @@ class DockerActor(connection: DockerConnection) extends Actor with ActorLogging
       }
 
     case stop(containerId) =>
-      log.info(s"Stopping docker container..")
+      log.debug(s"Stopping docker container..")
 
       Try(Await.result(container.stop(containerId), Duration.Inf)) match {
         case Success(_) =>
@@ -84,9 +82,8 @@ class DockerActor(connection: DockerConnection) extends Actor with ActorLogging
       }
 
 
-
     case delete(containerId) =>
-      log.info(s"Deleting docker container..")
+      log.debug(s"Deleting docker container..")
       Try(Await.result(container.remove(containerId, force = false, removeVolumes = false), Duration.Inf)) match {
         case Success(_) =>
           sender ! Status.Success
@@ -95,7 +92,7 @@ class DockerActor(connection: DockerConnection) extends Actor with ActorLogging
       }
 
     case pause(containerId) =>
-      log.info(s"Pausing docker container..")
+      log.debug(s"Pausing docker container..")
       Try(Await.result(container.pause(containerId), Duration.Inf)) match {
         case Success(_) =>
           sender ! Status.Success
@@ -104,7 +101,7 @@ class DockerActor(connection: DockerConnection) extends Actor with ActorLogging
       }
 
     case unpause(containerId) =>
-      log.info(s"Unpausing docker container..")
+      log.debug(s"Unpausing docker container..")
       Try(Await.result(container.unpause(containerId), Duration.Inf)) match {
         case Success(_) =>
           sender ! Status.Success
@@ -113,7 +110,7 @@ class DockerActor(connection: DockerConnection) extends Actor with ActorLogging
       }
 
     case restart(containerId) =>
-      log.info(s"Restarting docker container..")
+      log.debug(s"Restarting docker container..")
       Try(Await.result(container.restart(containerId), Duration.Inf)) match {
         case Success(_) =>
           sender ! Status.Success
@@ -122,7 +119,7 @@ class DockerActor(connection: DockerConnection) extends Actor with ActorLogging
       }
 
     case runCommand(containerId, command, attachStdin, attachStdout, attachStderr, detachKeys, privileged, tty, user) =>
-      log.info(s"running command in docker container..")
+      log.debug(s"running command in docker container..")
       val createCommand = Try(Await.result(container.commandCreate(containerId, command, attachStdin, attachStdout, attachStderr, detachKeys, privileged, tty, user), Duration.Inf))
       createCommand match {
         case Failure(ex) => sender ! Failure(ex)
@@ -140,7 +137,7 @@ class DockerActor(connection: DockerConnection) extends Actor with ActorLogging
 
       log.info(s"Fetching Container logs: stdErrSelected -> $stdErrSelected, stream -> $stream")
 
-      if(!stream){
+      if (!stream) {
         val logResult = Try(Await.result(container.retrieveLogs(containerId, stdErrSelected), Duration.Inf))
         logResult match {
           case Failure(ex) =>
@@ -189,4 +186,5 @@ object DockerActor {
                          tty: Option[Boolean],
                          user: Option[String]
                        )
+
 }

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/Image.scala

@@ -40,9 +40,7 @@ object Registry extends AppLogging {
 
   def main(args: Array[String]): Unit = {
     requestHandler.initialize()
-    log.info("Starting server ...")
     server.startServer(configuration.bindHost, configuration.bindPort)
-    log.info("Shutting down ...")
     requestHandler.shutdown()
     system.terminate()
   }