Comment 15 for bug 1474258

Reviewed: https://review.opencontrail.org/15157
Committed: http://github.org/Juniper/contrail-controller/commit/9702ef04e0c1aa38cb7eb824c6f3d51df97a49dc
Submitter: Zuul
Branch: R2.20

commit 9702ef04e0c1aa38cb7eb824c6f3d51df97a49dc
Author: Megh Bhatt <email address hidden>
Date: Wed Sep 23 15:49:03 2015 -0700

Check the return value of Sandesh::InitGenerator and exit if sandesh
initialization fails. Added kafka timer shutdown in contrail-query-engine
shutdown. Increased the startsecs time for contrail-dns since it was
taking around 7 secs for it to exit and hence supervisor needs to wait
for that much time to declare it up. Tested by returning false from
sandesh HTTP initialization.
Closes-Bug: #1474258

Conflicts:
 src/analytics/main.cc
 src/control-node/main.cc
 src/query_engine/qed.cc

Change-Id: Ie1a9d62dc53d8fe9f28b537130d9e03b5fba2e89
(cherry picked from commit 7d1192720f6a69deee552c3ce518ec22bdf4f4a7)