added separate update on error send

inlife · Oct 24, 2024 · f43e0fc · f43e0fc
1 parent b855ff9
commit f43e0fc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/packages/nexrender-core/src/tasks/render.js b/packages/nexrender-core/src/tasks/render.js
@@ -206,7 +206,6 @@ Estimated date of change to the new behavior: 2023-06-01.\n`);
                 job.onRenderError(job, new Error(matchError[1]));
             }
             errorSent = true
-            throw new Error(matchError[1]);
         }
 
         return data;

diff --git a/packages/nexrender-worker/src/instance.js b/packages/nexrender-worker/src/instance.js
@@ -179,14 +179,16 @@ const createWorker = () => {
                         }
                     }
                 })(client, settings);
+                currentJob.onRenderError = ((c, s, job) => (_, err) => {
+                    job.error = [].concat(job.error || [], [err.toString()]);
 
-                currentJob.onRenderError = (currentJob, err /* on render error */) => {
-                    currentJob.error = [].concat(currentJob.error || [], [err.toString()]);
-
-                    if (settings.onRenderError) {
-                        settings.onRenderError(currentJob, err);
+                    if (s.onRenderError) {
+                        s.onRenderError(job, err);
                     }
-                }
+
+                    /* send render progress to our server */
+                    c.updateJob(job.uid, getRenderingStatus(job));
+                })(client, settings, currentJob);
 
                 currentJob = await render(currentJob, settings); {
                     currentJob.state = 'finished';