add options to customize time error message

pofider · Mar 4, 2019 · 8d5da92 · 8d5da92
1 parent 805254a
commit 8d5da92
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/lib/in-process.js b/lib/in-process.js
@@ -17,7 +17,7 @@ ScriptsManager.prototype.execute = function (inputs, options, cb) {
 
   var timeout = setTimeout(function () {
     resolved = true
-    cb(new Error('Timeout error during executing script'))
+    cb(new Error(options.timeoutErrorMessage || 'Timeout error during executing script'))
   }, options.timeout || this.options.timeout)
 
   timeout.unref()

diff --git a/lib/manager-processes.js b/lib/manager-processes.js
@@ -23,7 +23,7 @@ ScriptsManager.prototype.execute = function (inputs, options, cb) {
   var timeout = setTimeout(function () {
     worker.kill()
     killed = true
-    cb(new Error('Timeout error during executing script'))
+    cb(new Error(options.timeoutErrorMessage || 'Timeout error during executing script'))
   }, options.timeout || this.options.timeout)
 
   timeout.unref()

diff --git a/lib/manager-servers.js b/lib/manager-servers.js
@@ -151,7 +151,7 @@ ScriptsManager.prototype.start = function (cb) {
 
           var error = new Error()
           error.weak = true
-          error.message = 'Timeout error during executing script'
+          error.message = reqOptions.timeoutErrorMessage || 'Timeout error during executing script'
 
           self._runningRequests = self._runningRequests.filter(r => r.rid !== reqOptions.rid)
 

diff --git a/test/test.js b/test/test.js
@@ -370,6 +370,17 @@ describe('scripts manager', function () {
       })
     })
 
+    it('should be able to customize message when timeout error', function (done) {
+      scriptsManager.execute({ foo: 'foo' }, {
+        execModulePath: path.join(__dirname, 'scripts', 'timeout.js'),
+        timeout: 10,
+        timeoutErrorMessage: 'Timeout testing case'
+      }, function (err) {
+        err.message.should.be.eql('Timeout testing case')
+        done()
+      })
+    })
+
     it('should not call callback after timeout error', function (done) {
       var resolved = 0