more physyncd startup fixes

sydlogan · Jul 10, 2020 · e8958db · e8958db
1 parent 4e14591
commit e8958db
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/platform/vs/docker-physyncd-vs/critical_processes b/platform/vs/docker-physyncd-vs/critical_processes
@@ -0,0 +1 @@
+program:syncd
diff --git a/platform/vs/docker-physyncd-vs/supervisord.conf b/platform/vs/docker-physyncd-vs/supervisord.conf
@@ -3,21 +3,39 @@ 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
+autorestart=unexpected
+startretries=0
+exitcodes=0,3
+events=PROCESS_STATE
+
+[eventlistener:supervisor-proc-exit-listener]
+command=/usr/bin/supervisor-proc-exit-listener --container-name physyncd
+events=PROCESS_STATE_EXITED
+autostart=true
+autorestart=unexpected
+
+[program:rsyslogd]
+command=/usr/sbin/rsyslogd -n -iNONE
+priority=1
+autostart=false
+autorestart=unexpected
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
 
-[program:rsyslogd]
-command=/usr/sbin/rsyslogd -n
+[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:physyncd]
 command=/usr/bin/physyncd_start.sh
@@ -26,3 +44,5 @@ autostart=false
 autorestart=false
 stdout_logfile=syslog
 stderr_logfile=syslog
+dependent_startup=true
+dependent_startup_wait_for=start:exited