Formatting Docker operation logs

Author: 24santoshr

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

@@ -25,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) =>
       val containerConfig = ContainerConfig(Image = DockerImage.getImageName(componentType),
@@ -58,7 +58,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(_) =>
@@ -68,9 +68,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
@@ -79,7 +78,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
@@ -88,7 +87,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
@@ -97,7 +96,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
@@ -106,7 +105,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)
@@ -124,7 +123,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) =>
@@ -173,4 +172,5 @@ object DockerActor {
                          tty: Option[Boolean],
                          user: Option[String]
                        )
+
 }

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/RequestHandler.scala

@@ -275,7 +275,7 @@ class RequestHandler(configuration: Configuration, instanceDao: InstanceDAO, con
             Failure(new RuntimeException(s"Failed to deploy container, docker host not reachable (${ex.getMessage})."))
           case Success((dockerId, host, port)) =>
             val normalizedHost = host.substring(1, host.length - 1)
-            log.info(s"Deployed new '$componentType' container with id: $dockerId, host: $normalizedHost and port: $port.")
+            log.info(s"Deployed new '$componentType' container with docker id: $dockerId, host: $normalizedHost and port: $port.")
 
             val newInstance = Instance(Some(id),
               normalizedHost,
@@ -510,16 +510,15 @@ class RequestHandler(configuration: Configuration, instanceDao: InstanceDAO, con
         OperationResult.Ok
       }
     } else if (instanceDao.getInstance(id).get.instanceState != InstanceState.Paused) {
-      log.info(s"Handling /stop for instance with id $id...")
+      log.debug(s"Handling /stop for instance with id $id...")
 
       val instance = instanceDao.getInstance(id).get
 
-      log.info("Stopping container...")
       implicit val timeout: Timeout = configuration.dockerOperationTimeout
 
       (dockerActor ? stop(instance.dockerId.get)).map {
         _ =>
-          log.info(s"Instance $id stopped.")
+          log.info(s"Docker Instance $id stopped.")
           instanceDao.setStateFor(instance.id.get, InstanceState.Stopped)
           fireStateChangedEvent(instanceDao.getInstance(instance.id.get).get)
       }.recover {
@@ -560,7 +559,6 @@ class RequestHandler(configuration: Configuration, instanceDao: InstanceDAO, con
       log.info(s"Handling /start for instance with id $id...")
       val instance = instanceDao.getInstance(id).get
       if (instance.instanceState == InstanceState.Stopped) {
-        log.info("Starting container...")
         implicit val timeout: Timeout = configuration.dockerOperationTimeout
 
         (dockerActor ? start(instance.dockerId.get)).map {
@@ -600,8 +598,6 @@ class RequestHandler(configuration: Configuration, instanceDao: InstanceDAO, con
       if (notSafeToDelete) {
         OperationResult.BlockingDependency
       } else if (instance.instanceState != InstanceState.Running) {
-        log.info("Deleting container...")
-
         implicit val timeout: Timeout = configuration.dockerOperationTimeout
 
         (dockerActor ? delete(instance.dockerId.get)).map {

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/connection/Server.scala

@@ -736,7 +736,7 @@ class Server(handler: RequestHandler) extends HttpApp
   def deleteContainer(id: Long): server.Route = {
     authenticateOAuth2[AccessToken]("Secure Site", AuthProvider.authenticateOAuthRequire(_, userType = UserType.Admin)) { token =>
       post {
-        log.debug(s"POST /delete?Id=$id has been called")
+        log.debug(s"POST /instances/$id/delete has been called")
         handler.handleDeleteContainer(id) match {
           case handler.OperationResult.IdUnknown =>
             log.warning(s"Cannot delete id $id, that id was not found.")