dcp-worker 4.4.2 → 4.4.4

package/bin/dcp-evaluator-start

@@ -19,11 +19,12 @@ const path    = require('path');
 
 const { logLevels } = require('../lib/consts');
 
-async function processExit(code)
+async function processExit(code, silent=true)
 {
   if (typeof code === 'undefined')
     code = process.exitCode;
-  console.debug('Exit, code', code);
+  if (!silent)
+    console.debug('Exit, code', code);
   await loggers.unhook();
   process.exit(code);
 }
@@ -35,7 +36,7 @@ function panic(...argv)
   processExit(1);
 }
 
-function main()
+async function main()
 {
   const dcpConfig = require('dcp/dcp-config');
   const loggingOptions = {
@@ -117,11 +118,11 @@ Options:
     switch (option)
     {
       case '?':
-        processExit(1);
+        await processExit(1, false);
         break;
       case 'h':
         help();
-        processExit(0);
+        await processExit(0, false);
         break;
       case 'P':
         options.prefix = optarg;
@@ -158,7 +159,7 @@ Options:
       {
         const dump = Object.keys(require(options.sandboxDefinitions));
         console.log(options.json ? JSON.stringify(dump) : dump);
-        processExit(0);
+        await processExit(0);
         break;
       }
       case 'D':
@@ -288,7 +289,7 @@ Options:
       console.log('Evaluator command:', [path.resolve(options.prefix, options.evaluator)].concat(files).concat(args).join(' '));
       console.log('Options:', options);
     }
-    processExit(0);
+    await processExit(0);
   }
 
   if (options.dumpFiles)
@@ -298,7 +299,7 @@ Options:
     if (options.json)
       dump = JSON.stringify(dump);
     console.log(dump);
-    processExit(0);
+    await processExit(0);
   }
 
   if (!options.stdio && options.sandboxType === 'node') {

package/lib/utils.js

@@ -207,9 +207,9 @@ async function registerWorker(worker, rkey, label, errorReporter)
     return errorReporter('invalid registration key');
 
   if (label)
-    debug('dcp-worker:registration')('registering worker with key', rkey, 'and label', label);
+    debug('dcp-worker:registration')('registering worker with key', rkey.slice(0,8), 'and label', label);
   else
-    debug('dcp-worker:registration')('registering worker with key', rkey);
+    debug('dcp-worker:registration')('registering worker with key', rkey.slice(0,8));
 
   const reg = await worker.register(rkey, label);
   if (!(reg instanceof Error))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcp-worker",
-  "version": "4.4.2",
+  "version": "4.4.4",
   "description": "Node.js Worker for Distributive Compute Platform",
   "main": "bin/dcp-worker",
   "keywords": [

package/www/hud/small-dark.html

@@ -394,6 +394,7 @@ class DistributiveWorkerLink
         <center><h3>DCP Worker</h3></center>
       </div>
       <table>
+        <tr><th>Worker Id:</th>            <td run-info="workerId" class="dcp-fixed-font"></td></tr>
         <tr><th>Running Since:</th>        <td run-info="startTime"></td></tr>
         <tr><th>Earnings Since Start:</th> <td run-info="totalEarnings"   class="dcp-amount"></td></tr>
         <tr><th>Earnings Account:</th>     <td run-info="earningsAccount" class="dcp-fixed-font"></td></tr>