From 0c005fdb1c25a2e97ce55692a4a98d2930ac0eac Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Thu, 14 May 2020 22:42:23 +0000
Subject: [PATCH] [docker-nat]: use service dependency in supervisord to start
 servicesx

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 dockers/docker-nat/start.sh         | 10 --------
 dockers/docker-nat/supervisord.conf | 39 +++++++++++++++++++++--------
 2 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/dockers/docker-nat/start.sh b/dockers/docker-nat/start.sh
index e1f303fee6..68603d007a 100755
--- a/dockers/docker-nat/start.sh
+++ b/dockers/docker-nat/start.sh
@@ -1,15 +1,5 @@
 #!/usr/bin/env bash
 
-rm -f /var/run/rsyslogd.pid
 rm -f /var/run/nat/*
 
 mkdir -p /var/warmboot/nat
-
-supervisorctl start rsyslogd
-
-supervisorctl start natmgrd
-
-supervisorctl start natsyncd
-
-supervisorctl start restore_nat_entries
-
diff --git a/dockers/docker-nat/supervisord.conf b/dockers/docker-nat/supervisord.conf
index 839d6f59ab..a6fb78aa1b 100644
--- a/dockers/docker-nat/supervisord.conf
+++ b/dockers/docker-nat/supervisord.conf
@@ -3,27 +3,39 @@ logfile_maxbytes=1MB
 logfile_backups=2
 nodaemon=true
 
+[eventlistener:dependent-startup]
+command=python -m supervisord_dependent_startup
+autostart=true
+autorestart=unexpected
+startretries=0
+exitcodes=0,3
+events=PROCESS_STATE
+
 [eventlistener:supervisor-proc-exit-listener]
 command=/usr/bin/supervisor-proc-exit-listener --container-name nat
 events=PROCESS_STATE_EXITED
 autostart=true
 autorestart=unexpected
 
-[program:start.sh]
-command=/usr/bin/start.sh
-priority=1
-autostart=true
-autorestart=false
-stdout_logfile=syslog
-stderr_logfile=syslog
-
 [program:rsyslogd]
-command=/usr/sbin/rsyslogd -n
-priority=2
+command=/usr/sbin/rsyslogd -n -iNONE
+priority=1
 autostart=false
 autorestart=unexpected
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+
+[program:start]
+command=/usr/bin/start.sh
+priority=2
+autostart=false
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
 
 [program:natmgrd]
 command=/usr/bin/natmgrd
@@ -32,6 +44,8 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited
 
 [program:natsyncd]
 command=/usr/bin/natsyncd
@@ -40,6 +54,8 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=natmgrd:running
 
 [program:restore_nat_entries]
 command=/usr/bin/restore_nat_entries.py
@@ -50,4 +66,5 @@ startsecs=0
 startretries=0
 stdout_logfile=syslog
 stderr_logfile=syslog
-
+dependent_startup=true
+dependent_startup_wait_for=natsyncd:running