Merge pull request #40 from marcbachmann/fix-timeout

Remove 2 minute force timeout

package.json

@@ -23,13 +23,7 @@
     "type": "git",
     "url": "git://github.com/marcbachmann/node-html-pdf.git"
   },
-  "keywords": [
-    "html",
-    "pdf",
-    "phantom",
-    "phantomjs",
-    "nodejs"
-  ],
+  "keywords": ["html", "pdf", "phantom", "phantomjs", "nodejs"],
   "bugs": {
     "url": "/~https://github.com/marcbachmann/node-html-pdf/issues"
   },

src/pdf.coffee

@@ -33,6 +33,7 @@ module.exports = class PDF
     @options.phantomPath ?= phantomjs?.path
     assert(@options.phantomPath, "html-pdf: Failed to load PhantomJS module. You have to set the path to the PhantomJS binary using 'options.phantomPath'")
     assert(typeof @html is 'string' && @html.length, "html-pdf: Can't create a pdf without an html string")
+    @options.timeout = parseInt(@options.timeout) || 30000
 
 
   toBuffer: (callback) ->
@@ -77,7 +78,7 @@ module.exports = class PDF
       child.stdin.end()
       child.kill()
       stderr = [new Buffer('html-pdf: PDF generation timeout. Phantom.js script did not exit.')] unless stderr.length
-    , parseInt(@options.timeout) || 30000
+    , @options.timeout
 
     child.stdout.on 'data', (buffer) ->
       stdout.push(buffer)

src/scripts/pdf_a4_portrait.coffee

@@ -22,12 +22,6 @@ phantom.onError = (msg, trace) ->
   exit(buildStack('Script - '+ msg, trace))
 
 
-# Force cleanup after 2 minutes
-setTimeout ->
-  exit('Force timeout')
-, 120000
-
-
 # Load configurations from stdin
 json = JSON.parse(system.stdin.readLine())
 exit('Did not receive any html') if !json.html?.trim()
@@ -43,6 +37,13 @@ page.onError = (msg, trace) ->
   exit(buildStack('Evaluation - '+ msg, trace))
 
 
+# Force cleanup after 2 minutes
+timeout = timeout+2000 if timeout = json.options.timeout
+setTimeout ->
+  exit('Force timeout')
+, timeout || 12000
+
+
 # Set up content
 # --------------
 content = page.evaluate ->