This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-170
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-170 by this push:
new 15665e8 WIP.
15665e8 is described below
commit 15665e8ff54c196797edfe18f515a3c26513b606
Author: Aaron Radzinski <[email protected]>
AuthorDate: Thu Dec 3 13:50:46 2020 -0800
WIP.
---
nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala | 2 +-
.../src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala | 9 +++++----
.../src/main/scala/org/apache/nlpcraft/server/NCServer.scala | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
index e82f220..ad8f191 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/common/package.scala
@@ -72,7 +72,7 @@ package object common {
def bb(s: Any): String = s"$BB${s.toString}$RST"
def kb(s: Any): String = s"$KB${s.toString}$RST"
- // Real color effect shortcuts...
+ // Effect shortcuts...
def rv(s: Any): String = s"$ansiReversed${s.toString}$RST"
def bo(s: Any): String = s"$ansiBold${s.toString}$RST"
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 1411fb4..1707f1f 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
@@ -266,16 +266,17 @@ private [probe] object NCProbeBoot extends LazyLogging
with NCOpenCensusTrace {
} match {
case Left(e) ⇒
logger.trace(s"Failed to read existing probe beacon:
${path.getAbsolutePath}", e)
- logger.trace(s"Overriding failed probe beacon:
${path.getAbsolutePath}")
+ logger.trace(s"Overriding corrupted probe beacon:
${path.getAbsolutePath}")
save()
case Right(rawObj) ⇒
val beacon = rawObj.asInstanceOf[NCCliProbeBeacon]
- if (ProcessHandle.of(beacon.pid).isPresent)
- logger.error(s"Cannot save probe beacon file as
another live local probe detected [pid=${beacon.pid}]")
- else {
+ if (ProcessHandle.of(beacon.pid).isPresent) {
+ logger.warn(s"Another local probe detected (safely
ignored) [id=${beacon.id}, pid=${beacon.pid}]")
+ logger.warn(s"NOTE: ${c("only one")} locally deployed
probe can be managed by 'nlpcraft.{sh|cmd}' management script.")
+ } else {
logger.trace(s"Overriding probe beacon for a phantom
process [pid=${beacon.pid}]")
save()
diff --git a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
index 2c8105e..b6e2f3b 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
@@ -331,7 +331,7 @@ object NCServer extends App with NCIgniteInstance with
LazyLogging with NCOpenCe
} match {
case Left(e) ⇒
logger.trace(s"Failed to read existing server beacon:
${path.getAbsolutePath}", e)
- logger.trace(s"Overriding failed server beacon:
${path.getAbsolutePath}")
+ logger.trace(s"Overriding corrupted server beacon:
${path.getAbsolutePath}")
save()