@nexrender/worker 1.46.9 → 1.47.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nexrender/worker",
-  "version": "1.46.9",
+  "version": "1.47.1",
   "author": "inlife",
   "main": "src/index.js",
   "homepage": "https://www.nexrender.com",
@@ -19,8 +19,8 @@
     ]
   },
   "dependencies": {
-    "@nexrender/api": "^1.45.6",
-    "@nexrender/core": "^1.46.9",
+    "@nexrender/api": "^1.47.1",
+    "@nexrender/core": "^1.47.1",
     "@nexrender/types": "^1.45.6",
     "arg": "^4.1.0",
     "chalk": "^2.4.2",
@@ -29,5 +29,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "56d4c1e8567a9c5ee67cef4b563a36e70238cbd6"
+  "gitHead": "01ec1b144a4a389f2f0da9bcf0c88d99b9448641"
 }

package/src/bin.js

@@ -14,6 +14,7 @@ const args = arg({
     '--cleanup':                Boolean,
 
     '--host':                   String,
+    '--name':                   String,
     '--secret':                 String,
 
     '--binary':                 String,
@@ -49,6 +50,7 @@ const args = arg({
     '-t':           '--tag-selector',
     '-c':           '--cleanup',
     '-h':           '--help',
+    '-n':           '--name',
     '-s':           '--secret',
     '-b':           '--binary',
     '-w':           '--workpath',
@@ -86,6 +88,10 @@ if (args['--help']) {
                                             specify which host {cyan nexrender-server} is running at,
                                             and where all api requests will be forwarded to
 
+      -n, --name {underline unique_worker_name}
+                                            specify which name the {cyan nexrender-worker} will have,
+                                            and how it will be identified in the {cyan nexrender-server}
+
       -s, --secret {underline secret_string}            specify a secret that will be required for every
                                             incoming http request to validate again
 
@@ -199,6 +205,7 @@ if (settings.hasOwnProperty('ae-params')) {
     settings['aeParams'] = settings['ae-params']
 }
 
+opt('name',                 '--name');
 opt('binary',               '--binary');
 opt('workpath',             '--workpath');
 opt('no-license',           '--no-license');

package/src/index.js

@@ -1,6 +1,7 @@
 const { createClient } = require('@nexrender/api')
 const { init, render } = require('@nexrender/core')
 const { getRenderingStatus } = require('@nexrender/types/job')
+const pkg = require('../package.json')
 
 const NEXRENDER_API_POLLING = process.env.NEXRENDER_API_POLLING || 30 * 1000;
 const NEXRENDER_TOLERATE_EMPTY_QUEUES = process.env.NEXRENDER_TOLERATE_EMPTY_QUEUES;
@@ -71,7 +72,10 @@ const start = async (host, secret, settings, headers) => {
         settings.tolerateEmptyQueues = NEXRENDER_TOLERATE_EMPTY_QUEUES;
     }
 
-    const client = createClient({ host, secret, headers });
+    headers = headers || {};
+    headers['user-agent'] = ('nexrender-worker/' + pkg.version + ' ' + (headers['user-agent'] || '')).trim();
+
+    const client = createClient({ host, secret, headers, name: settings.name });
 
     settings.track('Worker Started', {
         worker_tags_set: !!settings.tagSelector,
@@ -152,15 +156,13 @@ const start = async (host, secret, settings, headers) => {
                 settings.onError(job, err);
             }
 
-            await client.updateJob(job.uid, getRenderingStatus(job)).catch((err) => {
-                if (settings.stopOnError) {
-                    throw err;
-                } else {
-                    console.log(`[${job.uid}] error occurred: ${err.stack}`)
-                    console.log(`[${job.uid}] render proccess stopped with error...`)
-                    console.log(`[${job.uid}] continue listening next job...`)
-                }
-            });
+            try {
+                await client.updateJob(job.uid, getRenderingStatus(job))
+            }
+            catch (e) {
+                console.log(`[${job.uid}] error while updating job state to ${job.state}. Job abandoned.`)
+                console.log(`[${job.uid}] error stack: ${e.stack}`)
+            }
 
             if (settings.stopOnError) {
                 throw err;