[PATCH 17/26] Exit master proxies as soon as possible

[Simon Horman]

---
 src/proxy.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/proxy.c b/src/proxy.c
index c4f452c..ff5f635 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -575,9 +575,10 @@ void soft_stop(void)
        tv_update_date(0,1); /* else, the old time before select will be used */
        while (p) {
                if (p->state != PR_STSTOPPED) {
-                       Warning("Stopping %s %s in %d ms.\n", 
proxy_cap_str(p->cap), p->id, p->grace);
-                       send_log(p, LOG_WARNING, "Stopping %s %s in %d ms.\n", 
proxy_cap_str(p->cap), p->id, p->grace);
-                       p->stop_time = tick_add(now_ms, p->grace);
+                       int grace = is_master ? 0 : p->grace;
+                       Warning("Stopping %s %s in %d ms.\n", 
proxy_cap_str(p->cap), p->id, grace);
+                       send_log(p, LOG_WARNING, "Stopping %s %s in %d ms.\n", 
proxy_cap_str(p->cap), p->id, grace);
+                       p->stop_time = tick_add(now_ms, grace);
                }
                if (p->table.size && p->table.sync_task)
                         task_wakeup(p->table.sync_task, TASK_WOKEN_MSG);
-- 
1.7.2.3