From 38499ab0f8e58950c4e537c5dab4bca0d8748ac1 Mon Sep 17 00:00:00 2001
From: Guohan Lu <lguohan@gmail.com>
Date: Sat, 16 May 2020 01:09:51 +0000
Subject: [PATCH] [docker-mgmt-framework]: use service dependency in
 supervisord to start services

Signed-off-by: Guohan Lu <lguohan@gmail.com>
---
 dockers/docker-sonic-mgmt-framework/start.sh  |  6 ----
 .../supervisord.conf                          | 30 ++++++++++++++-----
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/dockers/docker-sonic-mgmt-framework/start.sh b/dockers/docker-sonic-mgmt-framework/start.sh
index 24d355670e..d6722a27fc 100755
--- a/dockers/docker-sonic-mgmt-framework/start.sh
+++ b/dockers/docker-sonic-mgmt-framework/start.sh
@@ -2,9 +2,3 @@
 
 mkdir -p /var/sonic
 echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
-
-rm -f /var/run/rsyslogd.pid
-
-supervisorctl start rsyslogd
-
-supervisorctl start rest-server
diff --git a/dockers/docker-sonic-mgmt-framework/supervisord.conf b/dockers/docker-sonic-mgmt-framework/supervisord.conf
index e26f815f5f..f78d0ec841 100644
--- a/dockers/docker-sonic-mgmt-framework/supervisord.conf
+++ b/dockers/docker-sonic-mgmt-framework/supervisord.conf
@@ -3,21 +3,33 @@ logfile_maxbytes=1MB
 logfile_backups=2
 nodaemon=true
 
-[program:start.sh]
-command=/usr/bin/start.sh
-priority=1
+[eventlistener:dependent-startup]
+command=python -m supervisord_dependent_startup
 autostart=true
-autorestart=false
-stdout_logfile=syslog
-stderr_logfile=syslog
+autorestart=unexpected
+startretries=0
+exitcodes=0,3
+events=PROCESS_STATE
 
 [program:rsyslogd]
-command=/usr/sbin/rsyslogd -n
-priority=2
+command=/usr/sbin/rsyslogd -n -iNONE
+priority=1
 autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+
+[program:start]
+command=/usr/bin/start.sh
+priority=2
+autostart=true
+autorestart=false
+startsecs=0
+stdout_logfile=syslog
+stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
 
 [program:rest-server]
 command=/usr/bin/rest-server.sh
@@ -26,3 +38,5 @@ autostart=false
 autorestart=true
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited