Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make swssconfig status FATAL when it fails #1009

Merged
merged 3 commits into from
Oct 4, 2017
Merged

Make swssconfig status FATAL when it fails #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
733d723
Make supervisor controlled one-shot program autorestart 0 time, so th…
qiluo-msft Oct 3, 2017
ffac483
Make swssconfig.sh strictly exit on any failure
qiluo-msft Oct 3, 2017
57ccac2
Tune startretries, tested in supervisor 3.3.2-1
qiluo-msft Oct 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dockers/docker-orchagent/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ stderr_logfile=syslog
command=/usr/bin/swssconfig.sh
priority=7
autostart=false
autorestart=false
autorestart=unexpected
startretries=0
stdout_logfile=syslog
stderr_logfile=syslog

Expand Down
2 changes: 2 additions & 0 deletions dockers/docker-orchagent/swssconfig.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/usr/bin/env bash

set -e

function config_acl {
if [ -f "/etc/sonic/acl.json" ]; then
mkdir -p /etc/swss/config.d/acl
Expand Down