dcp-worker 4.2.7 → 4.3.1

package/README.md

@@ -58,9 +58,7 @@ Evaluator in real time.  `dcp-worker -h` shows a help screen; to run in interact
 
 Administrators with a large number of workers may wish to configure [syslog](https://en.wikipedia.org/wiki/Syslog)
 logging, and use an off-the-shelf logging aggregation service. The full gamut of options relating to
-syslog output are documented in the `dcp-worker` help screen. Note that only one type of output at a
-time is currently possible with `dcp-worker`; Linux administrators who want both system journals and
-syslog output will need to configure their local syslog service to receive messages from systemd.
+syslog output are documented in the `dcp-worker` help screen.
 
 The Worker can log its activities to a variety of destinations (dependent on operating system), and
 emits logs when new jobs are fetched, job slices are completed, and so on.

package/bin/dcp-evaluator-manager

@@ -128,6 +128,13 @@ async function listenForConnections(config)
 
   server.listen({ host: hostaddr, port: config.net.port }, function daemonReady() {
     console.log('Listening for connections on', server._connectionKey);
+    if (Number(config.net.port) === 0)
+    {
+      console.log('Using dynamic port', server.address().port);
+      // Send info by IPC, if the spawn is setup for that. Probably don't need to try/catch.
+      if (process.send)
+        try { process.send(server.address().port); } catch (e) {}
+    }
     console.log('Evaluator command is', config.proc, config.argv);
   });
 }
@@ -538,7 +545,7 @@ function odRequire(moduleId)
 async function main()
 {
   const parser = new getopt.BasicParser('h(help)P:(prefix)H:p:d:(disable-monitor)l:(max-load)r:(rate)'
-                                        + 'Li:as:(signal)T:(loadavg-type)f:(pidfile)', process.argv);
+                                        + 'Li:as:(signal)T:(loadavg-type)f:(pidfile)n(no-pidfile)', process.argv);
   var option;
 
   if (dcpConfig.evaluator.listen)
@@ -651,6 +658,13 @@ async function main()
       case 'f':
       {
         daemonConfig.pidfile = option.optarg;
+        break;
+      }
+
+      case 'n':
+      {
+        daemonConfig.pidfile = false;
+        break;
       }
     }
   }

package/bin/dcp-worker

@@ -53,7 +53,8 @@ const replHelpers = {
   },
 };
 telnetd.init(replHelpers);
-require('dcp-client').init().then(main).catch(handleUnhandled);
+const dcpClientOptions = { dcpConfig: { worker: { logging: { syslog: {} } } } };
+require('dcp-client').init(dcpClientOptions).then(main).catch(handleUnhandled);
 
 function usage()
 {
@@ -83,7 +84,8 @@ Options:
       --logfile=filename             Change filename, implies --logger=logfile
       --overwrite-logfile            Overwrite previous log files instead of appending
       --syslog=url                   Change syslog url, implies --logger=syslog. Syslog
-                                     facility (eg. local7) is the URL pathname.
+                                     facility (eg. local7) is the pathname, structured
+                                     data is encoded in search params; id+name=value.
       --syslog=facility              Change syslog facility, implies --logger=syslog.
       --min-level=[logger,]level     Set the lowest level of log sent to a given logger
       --min-level=[console,]level    Set the lowest level of log sent to the console
@@ -203,7 +205,7 @@ function processCliOptsPhase1(argv, operatingMode)
   const loggingOptions = {
     minLevel:    { all: undefined },  /* minimum logging levels for console and per logger */
     loggers:     [],                  /* names of loggers (places logs go besides console) */
-    syslogUrl:   dcpConfig.worker.logging?.syslog?.url || new URL('udp://localhost:514/local7'),
+    syslogUrl:   new URL(dcpConfig.worker.logging?.syslog?.url || 'udp://localhost:514/local7'),
     logfile:     path.resolve(path.dirname(require.main.filename), dcpConfig.worker.logging?.logfile || '../log/dcp-worker.log'),
   };
   const evaluatorOptions = {

package/lib/utils.js

@@ -114,7 +114,7 @@ function uniq(array)
 
 /**
  * Syslog URLs are bit special - the pathname of the URL encodes the syslog facility. Additionally, a
- * plain string treated as just a pathname and no other components
+ * plain string treated as just a pathname.
  *
  * existingUrl                       newArg                             result
  * -------------------------------   --------------------------------   ----------------------------------

package/lib/worker-loggers/syslog.js

@@ -69,6 +69,22 @@ exports.open = function syslog$$open(options)
   if (!syslogTarget)
     throw new Error('missing syslog target');
 
+  if (options.syslogUrl.search)
+  {
+    /* search encodes RFC5424 structured data of the form ?id+param1=value1&id+param2=value2 into
+     * { id: { param1: value1, param2: value2 } } for consumption by the syslog-client-tls package.
+     */
+    const elements = {};
+    options.syslogUrl.searchParams.forEach((sdValue, name) => {
+      const [ sdId, sdParamName ] = name.split(' ');
+      if (!elements[sdId])
+        elements[sdId] = {};
+      elements[sdId][sdParamName] = sdValue;
+    });
+    syslogOptions.structuredData = elements;
+    debug('dcp-worker:logger')(`syslog data includes ${Object.keys(elements).length} structured data elements`);
+  }
+
   debug('dcp-worker:logger')('connecting to syslogd at ' + options.syslogUrl);
   syslogClient = syslog.createClient(options.syslogUrl.hostname, syslogOptions);
   processName = require('path').basename(process.mainModule.filename) || 'dcp-worker';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-worker",
-  "version": "4.2.7",
+  "version": "4.3.1",
   "description": "Node.js Worker for Distributive Compute Platform",
   "main": "bin/dcp-worker",
   "keywords": [
@@ -39,12 +39,12 @@
     "blessed": "0.1.81",
     "blessed-contrib": "4.11.0",
     "chalk": "^4.1.0",
-    "dcp-client": "5.1.9",
-    "kvin": "^1.2.7",
+    "dcp-client": "^5.2.0",
+    "kvin": "^9.0.0",
     "posix-getopt": "^1.2.1",
     "semver": "^7.3.8",
     "syslog-client": "1.1.1",
-    "syslog-client-tls": "1.2.1",
+    "syslog-client-tls": "github:wesgarland/node-syslog-client#0d734f33767bc6a8275552d3daa51712cc2d306d",
     "websocket": "1.0.34"
   },
   "optionalDependencies": {