You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nlpcraft.apache.org by ar...@apache.org on 2021/05/02 22:05:00 UTC

[incubator-nlpcraft] branch master updated: WIP.

This is an automated email from the ASF dual-hosted git repository.

aradzinski 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 65ecd20  WIP.
65ecd20 is described below

commit 65ecd20b14d7477cc330a7a77ea314b17d2f6212
Author: Aaron Radzinski <ar...@apache.org>
AuthorDate: Sun May 2 15:04:43 2021 -0700

    WIP.
---
 nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala | 2 +-
 nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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 7f5f79c..7d294de 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
@@ -448,8 +448,8 @@ private [probe] object NCProbeBoot extends LazyLogging with NCOpenCensusTrace {
         val ver = NCVersion.getCurrent
 
         tbl += (s"${B}Probe ID$RST", s"$BO${cfg.id}$RST")
+        tbl += (s"${B}Version$RST", s"${ver.version} released on ${ver.date.toString}")
         tbl += (s"${B}Probe Token$RST", cfg.token)
-        tbl += (s"${B}API Version$RST", ver.version + ", " + ver.date.toString)
         tbl += (s"${B}Down-Link$RST", cfg.downLinkString)
         tbl += (s"${B}Up-Link$RST", cfg.upLinkString)
         tbl += (s"${B}Lifecycle$RST", cfg.lifecycle)
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 7d292cc..b2b9093 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
@@ -299,7 +299,10 @@ object NCServer extends App with NCIgniteInstance with LazyLogging with NCOpenCe
 
                 val tbl = NCAsciiTable()
 
+                val ver = NCVersion.getCurrent
+
                 tbl += (s"${bo(b("PID"))}", Config.pid)
+                tbl += (s"${bo(b("Version"))}", s"${ver.version} released on ${ver.date.toString}")
                 tbl += (s"${bo(b("Database:"))}", "")
                 tbl += (s"${b("  JDBC URL")}", Config.dbUrl)
                 tbl += (s"${b("  JDBC Driver")}", Config.dbDriver)
@@ -323,7 +326,7 @@ object NCServer extends App with NCIgniteInstance with LazyLogging with NCOpenCe
                 tbl += (s"${b("  URL")}", Config.extCfgUrl)
                 tbl += (s"${b("  Check MD5")}", Config.extCfgCheckMd5)
 
-                logger.info(s"Sever configuration:\n$tbl")
+                logger.info(s"Server configuration:\n$tbl")
             }
             catch {
                 case e: IOException ⇒ U.prettyError(logger, "Failed to save server beacon.", e)