Log errors from Zotero.serial()

And output errors in concurrentCaller if not otherwise logged
Juris-M · Jul 7, 2017 · 3b2d7eb · 3b2d7eb
1 parent 71fb054
commit 3b2d7eb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -1494,8 +1494,10 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
 
 	this.serial = function (fn) {
 		Components.utils.import("resource://zotero/concurrentCaller.js");
-		var caller = new ConcurrentCaller(1);
-		caller.setLogger(Zotero.debug);
+		var caller = new ConcurrentCaller({
+			numConcurrent: 1,
+			onError: e => Zotero.logError(e)
+		});
 		return function () {
 			var args = arguments;
 			return caller.start(function () {

diff --git a/resource/concurrentCaller.js b/resource/concurrentCaller.js
@@ -223,7 +223,8 @@ ConcurrentCaller.prototype._processNext = function () {
 		this._numRunning--;
 
 		this._log("Error in function (" + this._numRunning + "/" + this.numConcurrent + ", "
-			+ this._queue.length + " in queue)");
+			+ this._queue.length + " in queue)"
+			+ ((!this.onError && !this.stopOnError) ? ": " + e : ""));
 
 		if (this.onError) {
 			this.onError(e);