From afa131fe84905a3e26a37e5c06f07bca7c32b8f9 Mon Sep 17 00:00:00 2001
From: Alain Takoudjou <alain.takoudjou@nexedi.com>
Date: Fri, 6 Jan 2017 14:43:17 +0000
Subject: [PATCH] monitor can set timeout value for check_url promise

---
 stack/monitor/buildout.cfg                   |  2 +-
 stack/monitor/instance-monitor.cfg.jinja2.in | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/stack/monitor/buildout.cfg b/stack/monitor/buildout.cfg
index 9834374c5d..dc37472bdf 100644
--- a/stack/monitor/buildout.cfg
+++ b/stack/monitor/buildout.cfg
@@ -96,7 +96,7 @@ recipe = slapos.recipe.template:jinja2
 filename = template-monitor.cfg
 template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
 rendered = ${buildout:directory}/template-monitor.cfg
-md5sum = 188989c4d47aba9f6e5de99a8b72aeaf
+md5sum = f71b96877968d3467976ebdb44eea17e
 context =
     key apache_location apache:location
     key gzip_location gzip:location
diff --git a/stack/monitor/instance-monitor.cfg.jinja2.in b/stack/monitor/instance-monitor.cfg.jinja2.in
index ee7c83c576..fba45edf48 100644
--- a/stack/monitor/instance-monitor.cfg.jinja2.in
+++ b/stack/monitor/instance-monitor.cfg.jinja2.in
@@ -152,6 +152,7 @@ parameter-file-path = ${monitor-instance-parameter:configuration-file-path}
 parameter-list = 
   raw monitor-user ${monitor-instance-parameter:username}
   htpasswd monitor-password ${monitor-htpassword-file:password-file} ${monitor-instance-parameter:username} ${httpd-monitor-htpasswd:htpasswd-path}
+  file promise-url-timeout ${monitor-init-check-url-timeout:file}
   ${monitor-instance-parameter:instance-configuration}
 # htpasswd entry:  htpasswd key password-file username htpasswd-file
 
@@ -161,6 +162,14 @@ python = {{ python_with_eggs }}
 
 promise-output-file = ${directory:monitor}/monitor-bootstrap-status
 
+[monitor-init-check-url-timeout]
+recipe = plone.recipe.command
+file = ${directory:etc}/check_url_PROMISE_TIMEOUT
+command = 
+  if [ ! -s "${:file}" ]; then
+    echo "20" > ${:file}
+  fi
+
 [monitor-conf]
 recipe = slapos.recipe.template:jinja2
 template = {{ monitor_conf_template }}
@@ -335,7 +344,7 @@ monitor-base-url = ${monitor-frontend-promise:url}
 #monitor-base-url = ${monitor-httpd-conf-parameter:url}
 root-instance-title = ${slap-configuration:root-instance-title}
 monitor-url-list =
-cors-domains = monitor.app.officejs.com 
+cors-domains = monitor.app.officejs.com
 # XXX Hard coded parameter
 collector-db = /srv/slapgrid/var/data-log/collector.db
 # Credentials
-- 
2.25.1