Fixes all component monit ctl scripts

- seperation of exec and chpst prevents spinning up orphan zombie processes during process startup [113471405]
cloudfoundry · Mar 2, 2016 · 1c8f88e · 1c8f88e
1 parent 0ee37f4
commit 1c8f88e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 26 deletions.
diff --git a/jobs/dea_logging_agent/templates/dea_logging_agent_ctl.erb b/jobs/dea_logging_agent/templates/dea_logging_agent_ctl.erb
@@ -14,14 +14,15 @@ case $1 in
     mkdir -p $RUN_DIR
     mkdir -p $LOG_DIR
 
-    echo $$ > $PIDFILE
-
     <% p("dea_logging_agent.debug") == true ? debug_string = "--debug " : debug_string = "" %>
 
-    exec /var/vcap/packages/dea_logging_agent/deaagent <%= debug_string %> \
-         --config /var/vcap/jobs/dea_logging_agent/config/dea_logging_agent.json \
-         >>$LOG_DIR/dea_logging_agent.stdout.log \
-         2>>$LOG_DIR/dea_logging_agent.stderr.log
+    chpst -u vcap:vcap /var/vcap/packages/dea_logging_agent/deaagent <%= debug_string %> \
+         --config /var/vcap/jobs/dea_logging_agent/config/dea_logging_agent.json &
+
+    echo $! > $PIDFILE
+
+    exec  >>$LOG_DIR/dea_logging_agent.stdout.log  \
+          2>>$LOG_DIR/dea_logging_agent.stderr.log
 
     ;;
 

diff --git a/jobs/doppler/templates/doppler_ctl.erb b/jobs/doppler/templates/doppler_ctl.erb
@@ -16,17 +16,19 @@ case $1 in
 
     chown vcap:vcap $LOG_DIR
 
-    echo $$ > $PIDFILE
-
     ulimit -l unlimited
     ulimit -n 65536
 
     <% p("doppler.debug") == true ? debug_string = "--debug " : debug_string = "" %>
 
-    exec chpst -u vcap:vcap /var/vcap/packages/doppler/doppler <%= debug_string %> \
-         --config /var/vcap/jobs/doppler/config/doppler.json \
-         >>$LOG_DIR/doppler.stdout.log \
-         2>>$LOG_DIR/doppler.stderr.log
+    chpst -u vcap:vcap /var/vcap/packages/doppler/doppler <%= debug_string %> \
+         --config /var/vcap/jobs/doppler/config/doppler.json &
+
+    echo $! > $PIDFILE
+
+    exec >>$LOG_DIR/doppler.stdout.log  \
+       2>>$LOG_DIR/doppler.stderr.log
+
     ;;
 
   stop)

diff --git a/jobs/loggregator_trafficcontroller/templates/loggregator_trafficcontroller_ctl.erb b/jobs/loggregator_trafficcontroller/templates/loggregator_trafficcontroller_ctl.erb
@@ -16,19 +16,22 @@ case $1 in
 
     chown vcap:vcap $LOG_DIR
 
-    echo $$ > $PIDFILE
 
     ulimit -l unlimited
     ulimit -n 65536
 
     <% p("traffic_controller.debug") == true ? debug_string = "--debug " : debug_string = "" %>
     <% p("traffic_controller.disable_access_control") == true ? disable_access_control_string = "--disableAccessControl" : disable_access_control_string = "" %>
 
-    exec chpst -u vcap:vcap /var/vcap/packages/loggregator_trafficcontroller/trafficcontroller <%= debug_string %> <%= disable_access_control_string %> \
-         --config /var/vcap/jobs/loggregator_trafficcontroller/config/loggregator_trafficcontroller.json \
-         >>$LOG_DIR/loggregator_trafficcontroller.stdout.log \
-         2>>$LOG_DIR/loggregator_trafficcontroller.stderr.log
-    ;;
+    chpst -u vcap:vcap /var/vcap/packages/loggregator_trafficcontroller/trafficcontroller <%= debug_string %> <%= disable_access_control_string %> \
+         --config /var/vcap/jobs/loggregator_trafficcontroller/config/loggregator_trafficcontroller.json &
+
+    echo $! > $PIDFILE
+
+    exec >>$LOG_DIR/loggregator_trafficcontroller.stdout.log \
+        2>>$LOG_DIR/loggregator_trafficcontroller.stderr.log
+
+	  ;;
 
   stop)
     kill_and_wait $PIDFILE 40

diff --git a/jobs/metron_agent/templates/metron_agent_ctl.erb b/jobs/metron_agent/templates/metron_agent_ctl.erb
@@ -16,18 +16,21 @@ case $1 in
 
     chown -R vcap:vcap $LOG_DIR
 
-    echo $$ > $PIDFILE
 
     (crontab -l | sed /metron_agent.*logrotate/d; cat /var/vcap/jobs/metron_agent/config/metron_agent_logrotate.cron) | sed /^$/d | crontab
 
     /var/vcap/packages/metron_agent/syslog_daemon_config/setup_syslog_forwarder.sh /var/vcap/jobs/metron_agent/config
 
+
     <% p("metron_agent.debug") == true ? debug_string = "--debug " : debug_string = "" %>
 
-    exec chpst -u vcap:vcap /var/vcap/packages/metron_agent/metron <%= debug_string %> \
-         --config /var/vcap/jobs/metron_agent/config/metron_agent.json \
-         >>$LOG_DIR/metron_agent.stdout.log \
-         2>>$LOG_DIR/metron_agent.stderr.log
+    chpst -u vcap:vcap /var/vcap/packages/metron_agent/metron <%= debug_string %> \
+         --config /var/vcap/jobs/metron_agent/config/metron_agent.json &
+
+    echo $! > $PIDFILE
+
+    exec >>$LOG_DIR/metron_agent.stdout.log \
+        2>>$LOG_DIR/metron_agent.stderr.log
 
     ;;
 

diff --git a/jobs/syslog_drain_binder/templates/syslog_drain_binder_ctl.erb b/jobs/syslog_drain_binder/templates/syslog_drain_binder_ctl.erb
@@ -21,14 +21,14 @@ case $1 in
 
     <% p("syslog_drain_binder.debug") == true ? debug_string = "--debug " : debug_string = "" %>
 
-    exec >>$LOG_DIR/syslog_drain_binder.stdout.log \
-         2>>$LOG_DIR/syslog_drain_binder.stderr.log
-
     chpst -u vcap:vcap /var/vcap/packages/syslog_drain_binder/syslog_drain_binder <%= debug_string %> \
          --config /var/vcap/jobs/syslog_drain_binder/config/syslog_drain_binder.json &
 
     echo $! > $PIDFILE
 
+    exec >>$LOG_DIR/syslog_drain_binder.stdout.log \
+         2>>$LOG_DIR/syslog_drain_binder.stderr.log
+
     ;;
 
   stop)