Improve logging

NTNU-IHB · Jun 17, 2019 · 291f698 · 291f698
1 parent 9cf5ebb
commit 291f698
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/java/FMU-proxy/fmu-proxy/src/main/kotlin/no/ntnu/ihb/fmuproxy/grpc/GrpcFmuServer.kt b/java/FMU-proxy/fmu-proxy/src/main/kotlin/no/ntnu/ihb/fmuproxy/grpc/GrpcFmuServer.kt
@@ -83,10 +83,10 @@ class GrpcFmuServer(
     override fun stop() {
         if (isRunning) {
             server?.also {
-                LOG.info("Stopping ${javaClass.simpleName} ...")
+                LOG.debug("Stopping ${javaClass.simpleName} ...")
                 it.shutdownNow()
                 it.awaitTermination()
-                LOG.info("${javaClass.simpleName} stopped!")
+                LOG.debug("${javaClass.simpleName} stopped!")
             }
             server = null
 

diff --git a/...-proxy/fmu-proxy/src/main/kotlin/no/ntnu/ihb/fmuproxy/grpc/services/GrpcFmuServiceImpl.kt b/...-proxy/fmu-proxy/src/main/kotlin/no/ntnu/ihb/fmuproxy/grpc/services/GrpcFmuServiceImpl.kt
@@ -70,7 +70,7 @@ class GrpcFmuServiceImpl(
             if (guid !in fmus) {
                 val fmu = AbstractFmu.from(url)
                 fmus[guid] = fmu
-                LOG.info("Loaded new FMU with guid=$guid!")
+                LOG.info("Loaded new FMU '${fmu.modelDescription.modelName}' with guid=$guid!")
             } else {
                 LOG.debug("FMU with guid=$guid already loaded, re-using it!")
             }
@@ -86,7 +86,7 @@ class GrpcFmuServiceImpl(
         synchronized(fmus) {
             if (guid !in fmus) {
                 fmus[guid] = fmu
-                LOG.info("Loaded new FMU with guid=$guid!")
+                LOG.info("Loaded new FMU '${fmu.modelDescription.modelName}' with guid=$guid!")
             } else {
                 fmu.close()
                 LOG.debug("FMU with guid=$guid already loaded, re-using it!")

diff --git a/java/FMU-proxy/fmu-proxy/src/main/kotlin/no/ntnu/ihb/fmuproxy/thrift/ThriftFmuServer.kt b/java/FMU-proxy/fmu-proxy/src/main/kotlin/no/ntnu/ihb/fmuproxy/thrift/ThriftFmuServer.kt
@@ -90,9 +90,9 @@ abstract class ThriftFmuServer(
 
     override fun stop() {
         server?.also {
-            LOG.info("Stopping ${javaClass.simpleName} ...")
+            LOG.debug("Stopping ${javaClass.simpleName} ...")
             it.stop()
-            LOG.info("${javaClass.simpleName} stopped!")
+            LOG.debug("${javaClass.simpleName} stopped!")
         }
     }
 

diff --git a/...xy/fmu-proxy/src/main/kotlin/no/ntnu/ihb/fmuproxy/thrift/services/ThriftFmuServiceImpl.kt b/...xy/fmu-proxy/src/main/kotlin/no/ntnu/ihb/fmuproxy/thrift/services/ThriftFmuServiceImpl.kt
@@ -72,9 +72,9 @@ class ThriftFmuServiceImpl(
             if (guid !in fmus) {
                 val fmu = AbstractFmu.from(url)
                 fmus[guid] = fmu
-                LOG.info("Loaded new FMU with guid=$guid!")
+                LOG.info("Loaded new FMU '${md.modelName}' with guid=$guid!")
             } else {
-                LOG.debug("FMU with guid=$guid already loaded, re-using it!")
+                LOG.debug("FMU '${md.modelName}' with guid=$guid already loaded, re-using it!")
             }
             return guid
         }
@@ -86,10 +86,10 @@ class ThriftFmuServiceImpl(
         synchronized(fmus) {
             if (guid !in fmus) {
                 fmus[guid] = fmu
-                LOG.info("Loaded new FMU with guid=$guid!")
+                LOG.info("Loaded new FMU '${fmu.modelDescription.modelName}' with guid=$guid!")
             } else {
                 fmu.close()
-                LOG.debug("FMU with guid=$guid already loaded, re-using it!")
+                LOG.info("FMU '${fmu.modelDescription.modelName}' with guid=$guid already loaded, re-using it!")
             }
             return guid
         }
@@ -177,9 +177,11 @@ class ThriftFmuServiceImpl(
     }
 
     override fun terminate(instanceId: InstanceId): Status {
-        return getSlave(instanceId).let {
-            it.terminate()
-            it.lastStatus.thriftType()
+        return getSlave(instanceId).let { slave ->
+            slave.terminate()
+            val status = slave.lastStatus
+            LOG.info("Terminated instance of ${slave.modelDescription.modelName} with status $status")
+            status.thriftType()
         }
     }
 
@@ -306,4 +308,3 @@ class ThriftFmuServiceImpl(
 //    }
 
 }
-