matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[docker-nat]: use service dependency in supervisord to start servicesx

Browse Source 
Signed-off-by: Guohan Lu <lguohan@gmail.com>
This commit is contained in:
Guohan Lu 2020-05-14 22:42:23 +00:00 committed by lguohan
parent 2c7e55ae98
commit 0c005fdb1c
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dockers/docker-nat/start.sh
View File

@ -1,15 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
rm -f /var/run/rsyslogd.pid
rm -f /var/run/nat/* rm -f /var/run/nat/*
mkdir -p /var/warmboot/nat mkdir -p /var/warmboot/nat
supervisorctl start rsyslogd
supervisorctl start natmgrd
supervisorctl start natsyncd
supervisorctl start restore_nat_entries

39
dockers/docker-nat/supervisord.conf
View File

@ -3,27 +3,39 @@ logfile_maxbytes=1MB
logfile_backups=2 logfile_backups=2
nodaemon=true 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] [eventlistener:supervisor-proc-exit-listener]
command=/usr/bin/supervisor-proc-exit-listener --container-name nat command=/usr/bin/supervisor-proc-exit-listener --container-name nat
events=PROCESS_STATE_EXITED events=PROCESS_STATE_EXITED
autostart=true autostart=true
autorestart=unexpected autorestart=unexpected
[program:start.sh]
command=/usr/bin/start.sh
priority=1
autostart=true
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
[program:rsyslogd] [program:rsyslogd]
command=/usr/sbin/rsyslogd -n command=/usr/sbin/rsyslogd -n -iNONE
priority=2 priority=1
autostart=false autostart=false
autorestart=unexpected autorestart=unexpected
stdout_logfile=syslog stdout_logfile=syslog
stderr_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] [program:natmgrd]
command=/usr/bin/natmgrd command=/usr/bin/natmgrd
@ -32,6 +44,8 @@ autostart=false
autorestart=false autorestart=false
stdout_logfile=syslog stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=start:exited
[program:natsyncd] [program:natsyncd]
command=/usr/bin/natsyncd command=/usr/bin/natsyncd
@ -40,6 +54,8 @@ autostart=false
autorestart=false autorestart=false
stdout_logfile=syslog stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=natmgrd:running
[program:restore_nat_entries] [program:restore_nat_entries]
command=/usr/bin/restore_nat_entries.py command=/usr/bin/restore_nat_entries.py
@ -50,4 +66,5 @@ startsecs=0
startretries=0 startretries=0
stdout_logfile=syslog stdout_logfile=syslog
stderr_logfile=syslog stderr_logfile=syslog
dependent_startup=true
dependent_startup_wait_for=natsyncd:running