This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-312
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-312 by this push:
new 28e2581 WIP.
28e2581 is described below
commit 28e2581668089962e24331a4d5d8926645144bfe
Author: Aaron Radzinski <[email protected]>
AuthorDate: Sat May 1 08:22:53 2021 -0700
WIP.
---
.../main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala | 2 ++
.../org/apache/nlpcraft/model/tools/cmdline/NCCliProbeBeacon.scala | 4 ++++
.../org/apache/nlpcraft/model/tools/cmdline/NCCliServerBeacon.scala | 4 ++++
nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala | 4 ++++
nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala | 4 ++++
5 files changed, 18 insertions(+)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
index 53170ff..6b7975a 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCli.scala
@@ -1385,6 +1385,7 @@ object NCCli extends NCCliBase {
val mdlSeq = beacon.models.split(",").map(s ⇒ s"${g(s.strip)}").toSeq
tbl += ("PID", s"${g(beacon.pid)}")
+ tbl += ("Version", s"${g(beacon.ver)} released on
${g(beacon.relDate)}")
tbl += ("Probe ID", s"${g(beacon.id)}")
tbl += ("Probe Up-Link", s"${g(beacon.upLink)}")
tbl += ("Probe Down-Link", s"${g(beacon.downLink)}")
@@ -1407,6 +1408,7 @@ object NCCli extends NCCliBase {
val logPath = if (beacon.logPath != null) g(beacon.logPath) else
y("<not available>")
tbl += ("PID", s"${g(beacon.pid)}")
+ tbl += ("Version", s"${g(beacon.ver)} released on
${g(beacon.relDate)}")
tbl += ("Database:", "")
tbl += (" URL", s"${g(beacon.dbUrl)}")
tbl += (" Driver", s"${g(beacon.dbDriver)}")
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliProbeBeacon.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliProbeBeacon.scala
index 508188f..b161203 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliProbeBeacon.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliProbeBeacon.scala
@@ -20,6 +20,8 @@ package org.apache.nlpcraft.model.tools.cmdline
/**
*
* @param pid
+ * @param ver
+ * @param relDate
* @param id
* @param token
* @param upLink
@@ -33,6 +35,8 @@ package org.apache.nlpcraft.model.tools.cmdline
*/
case class NCCliProbeBeacon (
pid: Long,
+ ver: String,
+ relDate: String,
id: String,
token: String,
upLink: String,
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliServerBeacon.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliServerBeacon.scala
index 3610e57..20c41fb 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliServerBeacon.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/model/tools/cmdline/NCCliServerBeacon.scala
@@ -20,6 +20,8 @@ package org.apache.nlpcraft.model.tools.cmdline
/**
*
* @param pid
+ * @param ver
+ * @param relDate
* @param dbUrl
* @param dbDriver
* @param dbPoolMin
@@ -44,6 +46,8 @@ package org.apache.nlpcraft.model.tools.cmdline
*/
case class NCCliServerBeacon(
pid: Long,
+ ver: String,
+ relDate: String,
dbUrl: String,
dbDriver: String,
dbPoolMin: Int,
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 f8e75ee..7f5f79c 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/NCProbeBoot.scala
@@ -256,8 +256,12 @@ private [probe] object NCProbeBoot extends LazyLogging
with NCOpenCensusTrace {
def save(): Unit = {
try {
managed(new ObjectOutputStream(new FileOutputStream(path)))
acquireAndGet { stream ⇒
+ val ver = NCVersion.getCurrent
+
stream.writeObject(NCCliProbeBeacon(
pid = ProcessHandle.current().pid(),
+ ver = ver.version,
+ relDate = ver.date.toString,
id = cfg.id,
token = cfg.token,
upLink = s"${cfg.upLink._1}:${cfg.upLink._2}",
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 9d4c403..7d292cc 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
@@ -264,8 +264,12 @@ object NCServer extends App with NCIgniteInstance with
LazyLogging with NCOpenCe
try {
managed(new ObjectOutputStream(new FileOutputStream(path)))
acquireAndGet { stream ⇒
+ val ver = NCVersion.getCurrent
+
stream.writeObject(NCCliServerBeacon(
pid = Config.pid,
+ ver = ver.version,
+ relDate = ver.date.toString,
dbUrl = Config.dbUrl,
dbDriver = Config.dbDriver,
dbPoolMin = Config.dbPoolMin,
