support timeout setting

README.md

@@ -27,6 +27,14 @@ varnish-generator -c ./examples/config.json -t ./examples/default.vcl
 
 - `version` The vcl version , default is `new Date().toISOString()`
 
+- `timeout` The timeout setting for all directors
+
+  - `connect` The connect timeout, default is `2`
+
+  - `firstByte` The firstByte timeout, default is `5`
+
+  - `betweenBytes` The betweenBytes timeout, default is `2`
+
 - `directors` Director list, Array
 
   - `name` The director's name
@@ -37,6 +45,13 @@ varnish-generator -c ./examples/config.json -t ./examples/default.vcl
 
   - `type` The algorithm of load balance, it can be 'fallback', 'hash', 'random', 'round_robin'. The default is 'round_robin'
 
+  - `timeout` The director timeout setting, if not set , it will be use the global timeout setting
+    - `connect` The connect timeout
+
+    - `firstByte` The firstByte timeout
+
+    - `betweenBytes` The betweenBytes timeout
+
   - `backends` The backend list, Array
 
     - `ip` The ip of backend

examples/varnish4/config.json

@@ -2,11 +2,21 @@
   "name": "varnish-test",
   "stale": 2,
   "varnish": "4",
+  "timeout": {
+    "connect": 1,
+    "firstByte": 2,
+    "betweenBytes": 2
+  },
   "directors": [
     {
       "name": "timtam",
       "prefix": "/timtam",
       "type": "fallback",
+      "timeout": {
+        "connect": 1,
+        "firstByte": 1,
+        "betweenBytes": 1
+      },
       "backends": [
         {
           "ip": "127.0.0.1",

examples/varnish4/config.yml

@@ -1,11 +1,19 @@
 name: varnish-test
 stale: 2
 varnish: "4"
+timeout:
+  connect: 1
+  firstByte: 2
+  betweenBytes: 2
 directors:
   -
     name: timtam
     prefix: /timtam
     type: fallback
+    timeout:
+      connect: 1
+      firstByte: 1
+      betweenBytes: 1 
     backends:
       -
         ip: 127.0.0.1

examples/varnish4/default.vcl

@@ -7,8 +7,8 @@ import directors;
 backend dcharts0 {
   .host = "127.0.0.1";
   .port = "3020";
-  .connect_timeout = 2s;
-  .first_byte_timeout = 5s;
+  .connect_timeout = 1s;
+  .first_byte_timeout = 2s;
   .between_bytes_timeout = 2s;
   .probe = {
     .url = "/ping";
@@ -22,8 +22,8 @@ backend dcharts0 {
 backend dcharts1 {
   .host = "127.0.0.1";
   .port = "3030";
-  .connect_timeout = 2s;
-  .first_byte_timeout = 5s;
+  .connect_timeout = 1s;
+  .first_byte_timeout = 2s;
   .between_bytes_timeout = 2s;
   .probe = {
     .url = "/ping";
@@ -37,8 +37,8 @@ backend dcharts1 {
 backend vicanso0 {
   .host = "127.0.0.1";
   .port = "3040";
-  .connect_timeout = 2s;
-  .first_byte_timeout = 5s;
+  .connect_timeout = 1s;
+  .first_byte_timeout = 2s;
   .between_bytes_timeout = 2s;
   .probe = {
     .url = "/ping";
@@ -52,8 +52,8 @@ backend vicanso0 {
 backend vicanso1 {
   .host = "127.0.0.1";
   .port = "3050";
-  .connect_timeout = 2s;
-  .first_byte_timeout = 5s;
+  .connect_timeout = 1s;
+  .first_byte_timeout = 2s;
   .between_bytes_timeout = 2s;
   .probe = {
     .url = "/ping";
@@ -67,9 +67,9 @@ backend vicanso1 {
 backend timtam0 {
   .host = "127.0.0.1";
   .port = "3000";
-  .connect_timeout = 2s;
-  .first_byte_timeout = 5s;
-  .between_bytes_timeout = 2s;
+  .connect_timeout = 1s;
+  .first_byte_timeout = 1s;
+  .between_bytes_timeout = 1s;
   .probe = {
     .url = "/ping";
     .interval = 3s;
@@ -82,9 +82,9 @@ backend timtam0 {
 backend timtam1 {
   .host = "127.0.0.1";
   .port = "3010";
-  .connect_timeout = 2s;
-  .first_byte_timeout = 5s;
-  .between_bytes_timeout = 2s;
+  .connect_timeout = 1s;
+  .first_byte_timeout = 1s;
+  .between_bytes_timeout = 1s;
   .probe = {
     .url = "/ping";
     .interval = 3s;
@@ -97,8 +97,8 @@ backend timtam1 {
 backend aslant0 {
   .host = "127.0.0.1";
   .port = "8000";
-  .connect_timeout = 2s;
-  .first_byte_timeout = 5s;
+  .connect_timeout = 1s;
+  .first_byte_timeout = 2s;
   .between_bytes_timeout = 2s;
   .probe = {
     .url = "/ping";
@@ -318,7 +318,7 @@ sub vcl_synth {
   if(resp.status == 701){
     synthetic("pong");
   } elsif(resp.status == 702){
-    synthetic("2017-02-23T09:38:18.059Z");
+    synthetic("2017-02-24T06:33:52.995Z");
   }
   set resp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";
   set resp.status = 200;

index.js

@@ -3,6 +3,12 @@ const path = require('path');
 const fs = require('fs');
 const yaml = require('js-yaml');
 
+const defaultTimeout = {
+  connect: 2,
+  firstByte: 5,
+  betweenBytes: 2,
+};
+
 /**
  * [readFilePromise description]
  * @param  {[type]} file [description]
@@ -60,7 +66,9 @@ function getBackendConfig(directors) {
       const arr = [];
       _.forEach(sortedDirectors, (director) => {
         _.forEach(director.backends, (backend, i) => {
-          const tmp = _.extend({}, backend);
+          const tmp = _.extend({
+            timeout: _.extend({}, defaultTimeout, director.timeout),
+          }, backend);
           tmp.name = `${_.camelCase(director.name)}${i}`;
           try {
             arr.push(template(tmp));
@@ -186,6 +194,7 @@ function getConfig(directors) {
 function getVcl(conf) {
   const config = _.extend({
     version: new Date().toISOString(),
+    timeout: defaultTimeout,
   }, conf);
   /* istanbul ignore if */
   if (!config.directors || !config.name) {
@@ -195,6 +204,10 @@ function getVcl(conf) {
     throw new Error('directors can not be empty');
   }
   _.forEach(config.directors, (item) => {
+    if (!item.timeout) {
+      /* eslint no-param-reassign:0 */
+      item.timeout = config.timeout;
+    }
     if (item.type === 'shard') {
       throw new Error('shard director is not support');
     }

template/backend.tpl

@@ -1,9 +1,9 @@
 backend <%= name %> {
   .host = "<%= ip %>";
   .port = "<%= port %>";
-  .connect_timeout = 2s;
-  .first_byte_timeout = 5s;
-  .between_bytes_timeout = 2s;
+  .connect_timeout = <%= timeout.connect %>s;
+  .first_byte_timeout = <%= timeout.firstByte %>s;
+  .between_bytes_timeout = <%= timeout.betweenBytes %>s;
   .probe = {
     .url = "/ping";
     .interval = 3s;