You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by se...@apache.org on 2020/10/10 18:35:55 UTC
[incubator-nlpcraft] branch master updated: Minor fixes.
This is an automated email from the ASF dual-hosted git repository.
sergeykamov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/master by this push:
new 788d1b6 Minor fixes.
788d1b6 is described below
commit 788d1b6293f58f7dcb346909250a09af38227649
Author: Sergey Kamov <se...@apache.org>
AuthorDate: Sat Oct 10 21:35:48 2020 +0300
Minor fixes.
---
.../src/main/scala/org/apache/nlpcraft/common/NCService.scala | 4 ++--
.../main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala | 11 ++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/NCService.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/NCService.scala
index 7a592ce..b4a89b8 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/NCService.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/NCService.scala
@@ -78,7 +78,7 @@ abstract class NCService extends LazyLogging with NCOpenCensusTrace {
starting = true
timeStampMs = currentTime
- logger.trace("$name staring...")
+ logger.trace(s"$name staring...")
addTags(currentSpan(),
"state" → "starting"
@@ -96,7 +96,7 @@ abstract class NCService extends LazyLogging with NCOpenCensusTrace {
stopping = true
timeStampMs = currentTime
- logger.trace("$name stopping...")
+ logger.trace(s"$name stopping...")
addTags(currentSpan(),
"state" → "stopping"
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
index 535a8f7..0d3f5fe 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
@@ -216,9 +216,6 @@ private [probe] object NCProbeBoot extends LazyLogging with NCOpenCensusTrace {
*/
private def stop0(): Unit = {
ignoring(classOf[Throwable]) {
- if (shutdownHook != null)
- Runtime.getRuntime.removeShutdownHook(shutdownHook)
-
stopManagers()
}
@@ -327,10 +324,14 @@ private [probe] object NCProbeBoot extends LazyLogging with NCOpenCensusTrace {
/**
*
*/
- private [probe] def stop(): Unit =
+ private [probe] def stop(): Unit = {
+ if (shutdownHook != null)
+ Runtime.getRuntime.removeShutdownHook(shutdownHook)
+
if (started)
stop0()
-
+ }
+
/**
*
* @param args