This is an automated email from the ASF dual-hosted git repository.
aradzinski pushed a commit to branch NLPCRAFT-108
in repository https://gitbox.apache.org/repos/asf/incubator-nlpcraft.git
The following commit(s) were added to refs/heads/NLPCRAFT-108 by this push:
new 752b0a8 WIP.
752b0a8 is described below
commit 752b0a83e5a88d572314527d4614bb70d37e2372
Author: Aaron Radzinski <[email protected]>
AuthorDate: Wed Oct 7 19:14:36 2020 -0700
WIP.
---
nlpcraft/src/main/resources/nlpcraft.conf | 4 +--
.../nlpcraft/model/tools/cmdline/NCCli.scala | 19 ++++++++++----
.../model/tools/cmdline/NCCliServerBeacon.scala | 8 ++++++
.../probe/mgrs/nlp/NCProbeEnrichmentManager.scala | 3 ++-
.../org/apache/nlpcraft/server/NCServer.scala | 29 +++++++++++++++++-----
.../lifecycle/NCServerLifecycleManager.scala | 2 +-
.../nlpcraft/server/user/NCUserManager.scala | 4 ---
7 files changed, 50 insertions(+), 19 deletions(-)
diff --git a/nlpcraft/src/main/resources/nlpcraft.conf
b/nlpcraft/src/main/resources/nlpcraft.conf
index 9edc0eb..1b1fa9d 100644
--- a/nlpcraft/src/main/resources/nlpcraft.conf
+++ b/nlpcraft/src/main/resources/nlpcraft.conf
@@ -266,8 +266,8 @@ nlpcraft {
# These are default up-link and down-link endpoints that the probe
will connect to.
# If changed - they need to be changed on both server and probe.
- upLink = "localhost:8201" # Server to probe data pipe.
- downLink = "localhost:8202" # Probe to server data pipe.
+ upLink = "0.0.0.0:8201" # Server to probe data pipe.
+ downLink = "0.0.0.0:8202" # Probe to server data pipe.
# All JARs in this folder will be scanned for models.
# Safely ignored if 'null' - but then 'models' should have at least
one element.
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 cba9d9d..f4de0a9 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
@@ -1210,19 +1210,28 @@ object NCCli extends App {
val logPath = if (beacon.logPath != null) g(beacon.logPath) else
y("<not available>")
tbl += ("PID", s"${g(beacon.pid)}")
- tbl += ("Database URL", s"${g(beacon.dbUrl)}")
+ tbl += ("Database:", "")
+ tbl += (" URL", s"${g(beacon.dbUrl)}")
tbl += (" Driver", s"${g(beacon.dbDriver)}")
tbl += (" Pool min", s"${g(beacon.dbPoolMin)}")
tbl += (" Pool init", s"${g(beacon.dbPoolInit)}")
tbl += (" Pool max", s"${g(beacon.dbPoolMax)}")
tbl += (" Pool increment", s"${g(beacon.dbPoolInc)}")
tbl += (" Reset on start", s"${g(beacon.dbInit)}")
- tbl += ("REST endpoint", s"${g(beacon.restEndpoint)}")
- tbl += ("Probe uplink", s"${g(beacon.upLink)}")
- tbl += ("Probe downlink", s"${g(beacon.downLink)}")
+ tbl += ("REST:", "")
+ tbl += (" Endpoint", s"${g(beacon.restEndpoint)}")
+ tbl += (" API provider", s"${g(beacon.restApi)}")
+ tbl += ("Probe:", "")
+ tbl += (" Uplink", s"${g(beacon.upLink)}")
+ tbl += (" Downlink", s"${g(beacon.downLink)}")
tbl += ("Token providers", s"${g(beacon.tokenProviders)}")
tbl += ("NLP engine", s"${g(beacon.nlpEngine)}")
- tbl += ("External config URL", s"${g(beacon.extConfigUrl)}")
+ tbl += ("Access tokens:", "")
+ tbl += (" Scan frequency", s"${beacon.acsToksScanMins} mins")
+ tbl += (" Expiration timeout", s"${beacon.acsToksExpireMins} mins")
+ tbl += ("External config:", "")
+ tbl += (" URL", s"${beacon.extConfigUrl}")
+ tbl += (" Check MD5",s"${beacon.extConfigCheckMd5}")
tbl += ("Log file", logPath)
tbl += ("Started on", s"${g(DateFormat.getDateTimeInstance.format(new
Date(beacon.startMs)))}")
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 2f6bd77..b4dda99 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
@@ -35,6 +35,10 @@ package org.apache.nlpcraft.model.tools.cmdline
* @param tokenProviders
* @param extConfigUrl
* @param beaconPath
+ * @param restApi
+ * @param extConfigCheckMd5
+ * @param acsToksScanMins
+ * @param acsToksExpireMins
* @param logPath
* @param ph
*/
@@ -55,6 +59,10 @@ case class NCCliServerBeacon(
tokenProviders: String,
extConfigUrl: String,
beaconPath: String,
+ restApi: String,
+ extConfigCheckMd5: Boolean,
+ acsToksScanMins: Int,
+ acsToksExpireMins: Int,
@transient var logPath: String = null,
@transient var ph: ProcessHandle = null
)
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
index 69d6c26..6699201 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/probe/mgrs/nlp/NCProbeEnrichmentManager.scala
@@ -232,7 +232,8 @@ object NCProbeEnrichmentManager extends NCService with
NCOpenCensusModelStats {
tbl += (s"${b("Text")}", nlpSens.map(s ⇒ rv(s.text)))
tbl += (s"${b("Model ID")}", mdlId)
- tbl += (s"${b("User ID")}", usrId)
+ tbl += (s"${b("User:")}", "")
+ tbl += (s"${b(" ID")}", usrId)
tbl += (s"${b(" First Name")}", senMeta.getOrElse("FIRST_NAME", ""))
tbl += (s"${b(" Last Name")}", senMeta.getOrElse("LAST_NAME", ""))
tbl += (s"${b(" Email")}", senMeta.getOrElse("EMAIL", ""))
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 d5e6b7a..f45b89c 100644
--- a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
+++ b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/NCServer.scala
@@ -241,6 +241,7 @@ object NCServer extends App with NCIgniteInstance with
LazyLogging with NCOpenCe
lazy val pid = ProcessHandle.current().pid()
lazy val restHost = getString(s"$pre.rest.host")
+ lazy val restApi = getString(s"$pre.rest.apiImpl")
lazy val restPort = getInt(s"$pre.rest.port")
lazy val upLink = getString(s"$pre.probe.links.upLink")
lazy val downLink = getString(s"$pre.probe.links.downLink")
@@ -252,8 +253,11 @@ object NCServer extends App with NCIgniteInstance with
LazyLogging with NCOpenCe
lazy val dbPoolInc =
getInt(s"$pre.database.c3p0.pool.acquireIncrement")
lazy val dbInit = getBool(s"$pre.database.igniteDbInitialize")
lazy val tokProviders = getString(s"$pre.tokenProviders")
+ lazy val acsToksScanMins =
getInt(s"$pre.user.timeoutScannerFreqMins")
+ lazy val acsToksExpireMins =
getInt(s"$pre.user.accessTokenExpireTimeoutMins")
lazy val nlpEngine = getString("nlpcraft.nlpEngine")
lazy val extCfgUrl = getString("nlpcraft.extConfig.extUrl")
+ lazy val extCfgCheckMd5 =
getBool("nlpcraft.extConfig.checkMd5")
lazy val restEndpoint =
s"${Config.restHost}:${Config.restPort}"
}
@@ -269,11 +273,15 @@ object NCServer extends App with NCIgniteInstance with
LazyLogging with NCOpenCe
dbPoolInc = Config.dbPoolInc,
dbInit = Config.dbInit,
restEndpoint = Config.restEndpoint,
+ restApi = Config.restApi,
upLink = Config.upLink,
downLink = Config.downLink,
tokenProviders = Config.tokProviders,
nlpEngine = Config.nlpEngine,
extConfigUrl = Config.extCfgUrl,
+ extConfigCheckMd5 = Config.extCfgCheckMd5,
+ acsToksScanMins = Config.acsToksScanMins,
+ acsToksExpireMins = Config.acsToksExpireMins,
beaconPath = path.getAbsolutePath,
startMs = currentTime
))
@@ -286,19 +294,28 @@ object NCServer extends App with NCIgniteInstance with
LazyLogging with NCOpenCe
val tbl = NCAsciiTable()
tbl += (s"${b("PID")}", Config.pid)
- tbl += (s"${b("Database URL")}", Config.dbUrl)
- tbl += (s"${b(" Driver")}", Config.dbDriver)
+ tbl += (s"${b("Database:")}", "")
+ tbl += (s"${b(" JDBC URL")}", Config.dbUrl)
+ tbl += (s"${b(" JDBC Driver")}", Config.dbDriver)
tbl += (s"${b(" Pool min")}", Config.dbPoolMin)
tbl += (s"${b(" Pool init")}", Config.dbPoolInit)
tbl += (s"${b(" Pool max")}", Config.dbPoolMax)
tbl += (s"${b(" Pool increment")}", Config.dbPoolInc)
tbl += (s"${b(" Reset on start")}", Config.dbInit)
- tbl += (s"${b("REST endpoint")}", Config.restEndpoint)
- tbl += (s"${b("Probe uplink")}", Config.upLink)
- tbl += (s"${b("Probe downlink")}", Config.downLink)
+ tbl += (s"${b("REST:")}", "")
+ tbl += (s"${b(" Endpoint")}", Config.restEndpoint)
+ tbl += (s"${b(" API provider")}", Config.restApi)
+ tbl += (s"${b("Probe:")}", "")
+ tbl += (s"${b(" Uplink")}", Config.upLink)
+ tbl += (s"${b(" Downlink")}", Config.downLink)
tbl += (s"${b("Token providers")}", Config.tokProviders)
tbl += (s"${b("NLP engine")}", Config.nlpEngine)
- tbl += (s"${b("External config URL")}", Config.extCfgUrl)
+ tbl += (s"${b("Access tokens:")}", "")
+ tbl += (s"${b(" Scan frequency")}",
s"${Config.acsToksScanMins} mins")
+ tbl += (s"${b(" Expiration timeout")}",
s"${Config.acsToksExpireMins} mins")
+ tbl += (s"${b("External config:")}", "")
+ tbl += (s"${b(" URL")}", Config.extCfgUrl)
+ tbl += (s"${b(" Check MD5")}", Config.extCfgCheckMd5)
logger.info(s"Sever configuration:\n$tbl")
}
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/lifecycle/NCServerLifecycleManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/lifecycle/NCServerLifecycleManager.scala
index 9edc199..7041fad 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/lifecycle/NCServerLifecycleManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/lifecycle/NCServerLifecycleManager.scala
@@ -54,7 +54,7 @@ object NCServerLifecycleManager extends NCService {
ackStarting()
if (Config.objects.isEmpty)
- logger.info("No lifecycle components configured.")
+ logger.trace("No lifecycle components configured.")
else {
val tbl = NCAsciiTable("Class")
diff --git
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/user/NCUserManager.scala
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/user/NCUserManager.scala
index bbf169e..4169351 100644
---
a/nlpcraft/src/main/scala/org/apache/nlpcraft/server/user/NCUserManager.scala
+++
b/nlpcraft/src/main/scala/org/apache/nlpcraft/server/user/NCUserManager.scala
@@ -180,10 +180,6 @@ object NCUserManager extends NCService with
NCIgniteInstance {
userLock = ignite.semaphore("userSemaphore", 1, true, true)
- logger.info(s"REST access tokens:")
- logger.info(s" ${c("+-")} scanned for timeout every
${Config.timeoutScannerFreqMins}m.")
- logger.info(s" ${c("+-")} invalidated if inactive for >=
${Config.accessTokenExpireTimeoutMins}m.")
-
ackStarted()
}
