diff --git a/dockers/docker-basic_router/supervisord.conf b/dockers/docker-basic_router/supervisord.conf index bfa84fdcdfb5..2318419417cf 100644 --- a/dockers/docker-basic_router/supervisord.conf +++ b/dockers/docker-basic_router/supervisord.conf @@ -8,13 +8,17 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/dockers/docker-database/supervisord.conf.j2 b/dockers/docker-database/supervisord.conf.j2 index f2fdffd2677d..7ed0bf7ef45e 100644 --- a/dockers/docker-database/supervisord.conf.j2 +++ b/dockers/docker-database/supervisord.conf.j2 @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true {% if INSTANCES %} @@ -46,8 +48,10 @@ priority=2 user=redis autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% endif %} {% endfor %} @@ -58,7 +62,9 @@ command=/bin/bash -c "sleep 300 && /usr/local/bin/flush_unused_database" priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 b/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 index d81573fd86f2..168a9d9e486e 100644 --- a/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 +++ b/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 @@ -63,8 +63,10 @@ command=/usr/sbin/dhcpmon -id {{ vlan_name }} priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for= {%- if relay_for_ipv4.flag %}isc-dhcpv4-relay-{{ vlan_name }}:running {% endif %} diff --git a/dockers/docker-dhcp-relay/dhcpv4-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv4-relay.agents.j2 index 42fac7980586..366e8f73d7a1 100644 --- a/dockers/docker-dhcp-relay/dhcpv4-relay.agents.j2 +++ b/dockers/docker-dhcp-relay/dhcpv4-relay.agents.j2 @@ -34,8 +34,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 index e392711f5326..ffa73909f8ab 100644 --- a/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 +++ b/dockers/docker-dhcp-relay/dhcpv6-relay.agents.j2 @@ -18,8 +18,10 @@ command=/usr/sbin/dhcp6relay priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 index 308997575a04..d26346613f37 100644 --- a/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 +++ b/dockers/docker-dhcp-relay/docker-dhcp-relay.supervisord.conf.j2 @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -72,7 +76,9 @@ command=/usr/local/bin/dhcprelayd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/dockers/docker-dhcp-server/supervisord.conf b/dockers/docker-dhcp-server/supervisord.conf index 54df6bd81900..fc9e4789abe2 100644 --- a/dockers/docker-dhcp-server/supervisord.conf +++ b/dockers/docker-dhcp-server/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -47,8 +51,10 @@ command=/usr/local/bin/dhcpservd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -57,8 +63,10 @@ command=/usr/sbin/kea-dhcp4 -c /etc/kea/kea-dhcp4.conf priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=dhcpservd:running environment=KEA_PIDFILE_DIR=/tmp/ diff --git a/dockers/docker-eventd/supervisord.conf b/dockers/docker-eventd/supervisord.conf index be51f922c120..095fec7e96b2 100644 --- a/dockers/docker-eventd/supervisord.conf +++ b/dockers/docker-eventd/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -45,8 +49,10 @@ command=/usr/bin/eventd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 index 113289af3b78..cdcf7366b8a8 100644 --- a/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 +++ b/dockers/docker-fpm-frr/frr/supervisord/supervisord.conf.j2 @@ -25,8 +25,10 @@ priority=1 autostart=false autorestart=unexpected startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:mgmtd] @@ -46,8 +48,10 @@ priority=4 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -57,8 +61,10 @@ priority=4 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=zebra:running @@ -68,8 +74,10 @@ priority=4 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=zsocket:exited @@ -81,8 +89,10 @@ stopsignal=KILL autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=zebra:running {% endif %} @@ -98,8 +108,10 @@ stopsignal=KILL autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=zsocket:exited @@ -111,8 +123,10 @@ stopsignal=KILL autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=zebra:running @@ -123,8 +137,10 @@ stopsignal=KILL autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=zebra:running {% endif %} @@ -135,8 +151,10 @@ priority=6 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=bgpd:running @@ -151,8 +169,10 @@ priority=6 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=bgpd:running @@ -164,8 +184,10 @@ priority=6 autostart=false autorestart=true startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=bgpd:running @@ -175,8 +197,10 @@ priority=6 autostart=false autorestart=true startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=bgpd:running @@ -189,8 +213,10 @@ priority=6 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=bgpd:running {% endif %} @@ -203,8 +229,10 @@ autostart=false autorestart=false startsecs=0 startretries=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=bgpd:running {% endif %} diff --git a/dockers/docker-fpm-gobgp/supervisord.conf b/dockers/docker-fpm-gobgp/supervisord.conf index 625f867950df..1d621254178e 100644 --- a/dockers/docker-fpm-gobgp/supervisord.conf +++ b/dockers/docker-fpm-gobgp/supervisord.conf @@ -15,29 +15,37 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:gobgpd] command=/usr/sbin/gobgpd -p -f /etc/gobgp/gobgpd.conf -r priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:fpmsyncd] command=fpmsyncd priority=5 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/dockers/docker-iccpd/supervisord.conf b/dockers/docker-iccpd/supervisord.conf index 323389aca3e2..b1ab160c7eb0 100644 --- a/dockers/docker-iccpd/supervisord.conf +++ b/dockers/docker-iccpd/supervisord.conf @@ -17,8 +17,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -27,8 +29,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -37,7 +41,9 @@ command=/usr/bin/iccpd.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/dockers/docker-lldp/supervisord.conf.j2 b/dockers/docker-lldp/supervisord.conf.j2 index b2efe00bb966..a00d7e85bc0a 100644 --- a/dockers/docker-lldp/supervisord.conf.j2 +++ b/dockers/docker-lldp/supervisord.conf.j2 @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -53,8 +57,10 @@ command=/usr/sbin/lldpd -d -I Ethernet[0-9]*,eth0 -C eth0 priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -64,8 +70,10 @@ priority=3 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=lldpd:running @@ -74,8 +82,10 @@ command=/usr/bin/env python3 -m lldp_syncd priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=waitfor_lldp_ready:exited @@ -84,7 +94,9 @@ command=/usr/bin/lldpmgrd priority=5 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=lldp-syncd:running diff --git a/dockers/docker-macsec/supervisord.conf b/dockers/docker-macsec/supervisord.conf index 3ab4f372f101..6448c628e7fe 100644 --- a/dockers/docker-macsec/supervisord.conf +++ b/dockers/docker-macsec/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -44,7 +46,9 @@ command=/usr/bin/macsecmgrd priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/dockers/docker-mux/supervisord.conf b/dockers/docker-mux/supervisord.conf index 43f31050646a..62c524856e6b 100644 --- a/dockers/docker-mux/supervisord.conf +++ b/dockers/docker-mux/supervisord.conf @@ -23,8 +23,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:linkmgrd] @@ -34,7 +36,9 @@ autostart=false autorestart=false startsecs=0 startretries=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/dockers/docker-nat/supervisord.conf b/dockers/docker-nat/supervisord.conf index 8d7e184efc49..ab8338f9607d 100644 --- a/dockers/docker-nat/supervisord.conf +++ b/dockers/docker-nat/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -44,8 +48,10 @@ command=/usr/bin/natmgrd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -54,8 +60,10 @@ command=/usr/bin/natsyncd priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=natmgrd:running @@ -66,7 +74,9 @@ autostart=false autorestart=false startsecs=0 startretries=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=natsyncd:running diff --git a/dockers/docker-orchagent/arp_update.conf b/dockers/docker-orchagent/arp_update.conf index a27a3b391cd2..226e5d0761ab 100644 --- a/dockers/docker-orchagent/arp_update.conf +++ b/dockers/docker-orchagent/arp_update.conf @@ -3,7 +3,9 @@ command=/usr/bin/arp_update priority=7 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited diff --git a/dockers/docker-orchagent/ndppd.conf b/dockers/docker-orchagent/ndppd.conf index 86297de94a45..b24340c35e2f 100644 --- a/dockers/docker-orchagent/ndppd.conf +++ b/dockers/docker-orchagent/ndppd.conf @@ -3,8 +3,10 @@ command=/usr/sbin/ndppd priority=7 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=wait_for_link:exited @@ -14,7 +16,9 @@ priority=7 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited \ No newline at end of file diff --git a/dockers/docker-orchagent/supervisord.conf.j2 b/dockers/docker-orchagent/supervisord.conf.j2 index 026958197fb3..eee121f1c68b 100644 --- a/dockers/docker-orchagent/supervisord.conf.j2 +++ b/dockers/docker-orchagent/supervisord.conf.j2 @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true {% set is_fabric_asic = 0 %} @@ -46,8 +48,10 @@ autostart=false autorestart=false startsecs=0 startretries=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running {% if ENABLE_ASAN == "y" %} @@ -61,8 +65,10 @@ command=/usr/bin/portsyncd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running {% if ENABLE_ASAN == "y" %} @@ -76,8 +82,10 @@ priority=4 autostart=false autorestart=false stdout_capture_maxbytes=1MB -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for={{ orchagent_dependent_startup_wait_for }} {% if ENABLE_ASAN == "y" %} @@ -91,8 +99,10 @@ autostart=false autorestart=unexpected startretries=0 startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=orchagent:running {% if ENABLE_ASAN == "y" %} @@ -107,8 +117,10 @@ autostart=false autorestart=false startsecs=0 startretries=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {%- endif %} @@ -121,8 +133,10 @@ autostart=false autorestart=false startretries=0 startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=orchagent:running {% if ENABLE_ASAN == "y" %} @@ -136,8 +150,10 @@ command=/usr/bin/neighsyncd priority=7 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} @@ -151,8 +167,10 @@ command=/usr/bin/vlanmgrd priority=8 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} @@ -166,8 +184,10 @@ command=/usr/bin/intfmgrd priority=9 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} @@ -181,8 +201,10 @@ command=/usr/bin/portmgrd priority=10 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} @@ -195,8 +217,10 @@ command=/usr/bin/fabricmgrd priority=10 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} @@ -209,8 +233,10 @@ command=/usr/bin/buffermgrd.sh priority=11 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} @@ -224,8 +250,10 @@ command=/usr/bin/vrfmgrd priority=13 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} @@ -239,8 +267,10 @@ command=/usr/bin/nbrmgrd priority=15 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} @@ -254,8 +284,10 @@ command=/usr/bin/vxlanmgrd priority=16 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} @@ -269,8 +301,10 @@ command=/usr/bin/tunnelmgrd priority=17 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} @@ -283,8 +317,10 @@ command=/usr/bin/enable_counters.py priority=12 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited @@ -294,8 +330,10 @@ command=/usr/bin/fdbsyncd priority=17 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited {% if ENABLE_ASAN == "y" %} diff --git a/dockers/docker-orchagent/tunnel_packet_handler.conf b/dockers/docker-orchagent/tunnel_packet_handler.conf index aa6f3d2f3380..8bbe045cd23b 100644 --- a/dockers/docker-orchagent/tunnel_packet_handler.conf +++ b/dockers/docker-orchagent/tunnel_packet_handler.conf @@ -3,7 +3,9 @@ command=/usr/bin/tunnel_packet_handler.py priority=12 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=swssconfig:exited diff --git a/dockers/docker-pde/supervisord.conf b/dockers/docker-pde/supervisord.conf index 58a32d833163..af61ee0cffda 100644 --- a/dockers/docker-pde/supervisord.conf +++ b/dockers/docker-pde/supervisord.conf @@ -8,5 +8,7 @@ command=/bin/bash -c "rm -f /var/run/rsyslogd.pid && /usr/sbin/rsyslogd -n" priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 index fd2d07296379..89b23b5b1ee2 100644 --- a/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 +++ b/dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2 @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true @@ -44,8 +46,10 @@ command=/usr/local/bin/chassisd priority=3 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=10 dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -57,8 +61,10 @@ command=/usr/local/bin/chassis_db_init priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=0 dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -70,8 +76,10 @@ command=/usr/bin/lm-sensors.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=0 dependent_startup=true dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}delay:exited{% endif %} @@ -83,8 +91,10 @@ command=/usr/sbin/fancontrol priority=4 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=10 dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -96,8 +106,10 @@ command={% if API_VERSION == 3 and 'ledd' not in python2_daemons %}python3 {% el priority=5 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=10 dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -125,8 +137,10 @@ command={{ command }} priority=6 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=10 dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -143,8 +157,10 @@ command=nice -n -20 python3 /usr/local/bin/ycabled priority=7 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=10 dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -157,8 +173,10 @@ command={% if API_VERSION == 3 and 'psud' not in python2_daemons %}python3 {% el priority=8 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=10 dependent_startup=true dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}delay:exited{% endif %} @@ -170,8 +188,10 @@ command={% if API_VERSION == 3 and 'syseepromd' not in python2_daemons %}python3 priority=9 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=10 dependent_startup=true dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}delay:exited{% endif %} @@ -183,8 +203,10 @@ command={% if API_VERSION == 3 and 'thermalctld' not in python2_daemons %}python priority=10 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=10 startretries=50 dependent_startup=true @@ -197,8 +219,10 @@ command=/usr/local/bin/pcied priority=11 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=10 dependent_startup=true dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}delay:exited{% endif %} @@ -210,8 +234,10 @@ command=/usr/local/bin/sensormond priority=10 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=10 dependent_startup=true dependent_startup_wait_for=rsyslogd:running {% if delay_non_critical_daemon %}delay:exited{% endif %} @@ -223,8 +249,10 @@ command=/usr/local/bin/stormond priority=10 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true startsecs=10 dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 index 22f33e412195..0ab038039a96 100644 --- a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 +++ b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf.j2 @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=1 autostart=true autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -65,8 +69,10 @@ priority=3 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -75,8 +81,10 @@ command=/usr/sbin/radvd -n priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=wait_for_link:exited {% endif -%} diff --git a/dockers/docker-sflow/supervisord.conf b/dockers/docker-sflow/supervisord.conf index d6cd5092e53d..dfffc4da3f17 100644 --- a/dockers/docker-sflow/supervisord.conf +++ b/dockers/docker-sflow/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -44,8 +46,10 @@ command=/usr/bin/sflowmgrd priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -54,7 +58,9 @@ command=/usr/bin/port_index_mapper.py priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/dockers/docker-sonic-bmp/supervisord.conf b/dockers/docker-sonic-bmp/supervisord.conf index 7a751c7cfce1..1e452ef78400 100644 --- a/dockers/docker-sonic-bmp/supervisord.conf +++ b/dockers/docker-sonic-bmp/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=true -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:bmp] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -47,8 +51,10 @@ command=python3 /usr/local/bin/bmpcfgd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:openbmpd] @@ -56,6 +62,8 @@ command=/usr/bin/openbmpd -f -l /var/log/openbmpd.log -c /etc/bmp/openbmpd.conf priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true diff --git a/dockers/docker-sonic-gnmi/supervisord.conf b/dockers/docker-sonic-gnmi/supervisord.conf index b70e6c868de0..b14a99ad3738 100644 --- a/dockers/docker-sonic-gnmi/supervisord.conf +++ b/dockers/docker-sonic-gnmi/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=true -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -44,8 +48,10 @@ command=/usr/bin/gnmi-native.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -54,7 +60,9 @@ command=/usr/bin/dialout.sh priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=gnmi-native:running diff --git a/dockers/docker-sonic-mgmt-framework/supervisord.conf b/dockers/docker-sonic-mgmt-framework/supervisord.conf index 1fcf2a580999..37f3f1945a80 100644 --- a/dockers/docker-sonic-mgmt-framework/supervisord.conf +++ b/dockers/docker-sonic-mgmt-framework/supervisord.conf @@ -17,8 +17,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -27,8 +29,10 @@ priority=2 autostart=true autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -37,7 +41,9 @@ command=/usr/bin/rest-server.sh priority=3 autostart=false autorestart=true -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/dockers/docker-sonic-p4rt/supervisord.conf b/dockers/docker-sonic-p4rt/supervisord.conf index f9383e2adf96..aa12d395a25a 100644 --- a/dockers/docker-sonic-p4rt/supervisord.conf +++ b/dockers/docker-sonic-p4rt/supervisord.conf @@ -23,8 +23,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -33,8 +35,10 @@ priority=2 autostart=true autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -43,7 +47,9 @@ command=/usr/bin/p4rt.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/dockers/docker-sonic-restapi/supervisord.conf b/dockers/docker-sonic-restapi/supervisord.conf index c95b4b6b92d8..b531d6cf5cad 100644 --- a/dockers/docker-sonic-restapi/supervisord.conf +++ b/dockers/docker-sonic-restapi/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=true -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -44,8 +48,10 @@ command=/usr/bin/restapi.sh priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/dockers/docker-sonic-telemetry/supervisord.conf b/dockers/docker-sonic-telemetry/supervisord.conf index 5ab0e3ca59da..c0eba9ee4c2c 100644 --- a/dockers/docker-sonic-telemetry/supervisord.conf +++ b/dockers/docker-sonic-telemetry/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=true -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -44,8 +48,10 @@ command=/usr/bin/telemetry.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -54,7 +60,9 @@ command=/usr/bin/dialout.sh priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=telemetry:running diff --git a/dockers/docker-teamd/supervisord.conf b/dockers/docker-teamd/supervisord.conf index db6a8cfb9a5a..731c825b6a8d 100644 --- a/dockers/docker-teamd/supervisord.conf +++ b/dockers/docker-teamd/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=true autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -45,8 +49,10 @@ priority=3 autostart=false autorestart=false stopwaitsecs=60 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -56,8 +62,10 @@ priority=4 startsecs=5 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=teammgrd:running @@ -66,8 +74,10 @@ command=/usr/bin/tlm_teamd priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/files/image_config/containercfgd/containercfgd.conf b/files/image_config/containercfgd/containercfgd.conf index 704b5490c3fb..e0cf7c478e2f 100644 --- a/files/image_config/containercfgd/containercfgd.conf +++ b/files/image_config/containercfgd/containercfgd.conf @@ -3,7 +3,9 @@ command=python3 /usr/local/bin/containercfgd priority=99 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/platform/barefoot/docker-saiserver-bfn/supervisord.conf b/platform/barefoot/docker-saiserver-bfn/supervisord.conf index 4400184e5395..96ffc271efdf 100644 --- a/platform/barefoot/docker-saiserver-bfn/supervisord.conf +++ b/platform/barefoot/docker-saiserver-bfn/supervisord.conf @@ -8,16 +8,20 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:saiserver] environment=LD_LIBRARY_PATH="/opt/bfn/install/lib" @@ -25,6 +29,8 @@ command=/usr/bin/saiserver_start.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/platform/barefoot/docker-syncd-bfn/supervisord.conf b/platform/barefoot/docker-syncd-bfn/supervisord.conf index 62230f8be9d0..0007e95d9523 100644 --- a/platform/barefoot/docker-syncd-bfn/supervisord.conf +++ b/platform/barefoot/docker-syncd-bfn/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -45,7 +49,9 @@ command=/usr/bin/syncd_start.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/platform/broadcom/docker-saiserver-brcm/supervisord.conf b/platform/broadcom/docker-saiserver-brcm/supervisord.conf index d20dac89141b..57eefe5507df 100644 --- a/platform/broadcom/docker-saiserver-brcm/supervisord.conf +++ b/platform/broadcom/docker-saiserver-brcm/supervisord.conf @@ -8,21 +8,27 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:saiserver] command=/usr/bin/saiserver_start.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/platform/broadcom/docker-syncd-brcm-dnx/supervisord.conf b/platform/broadcom/docker-syncd-brcm-dnx/supervisord.conf index 7f1943600a31..ae63ce266fee 100644 --- a/platform/broadcom/docker-syncd-brcm-dnx/supervisord.conf +++ b/platform/broadcom/docker-syncd-brcm-dnx/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -44,8 +48,10 @@ command=/usr/bin/syncd_start.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -55,7 +61,9 @@ priority=4 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=syncd:running diff --git a/platform/broadcom/docker-syncd-brcm/supervisord.conf b/platform/broadcom/docker-syncd-brcm/supervisord.conf index 7f1943600a31..ae63ce266fee 100644 --- a/platform/broadcom/docker-syncd-brcm/supervisord.conf +++ b/platform/broadcom/docker-syncd-brcm/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -44,8 +48,10 @@ command=/usr/bin/syncd_start.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -55,7 +61,9 @@ priority=4 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=syncd:running diff --git a/platform/cavium/docker-saiserver-cavm/supervisord.conf b/platform/cavium/docker-saiserver-cavm/supervisord.conf index cb67a0fc9a47..d8fef1c012fc 100644 --- a/platform/cavium/docker-saiserver-cavm/supervisord.conf +++ b/platform/cavium/docker-saiserver-cavm/supervisord.conf @@ -8,21 +8,27 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:saiserver] command=/usr/bin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/platform/cavium/docker-syncd-cavm/supervisord.conf b/platform/cavium/docker-syncd-cavm/supervisord.conf index 0f1ae5593486..e19a41baca92 100644 --- a/platform/cavium/docker-syncd-cavm/supervisord.conf +++ b/platform/cavium/docker-syncd-cavm/supervisord.conf @@ -15,21 +15,27 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:syncd] command=/usr/bin/syncd_start.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/platform/centec-arm64/docker-saiserver-centec/supervisord.conf b/platform/centec-arm64/docker-saiserver-centec/supervisord.conf index ccb107b3d1f8..ab3bb3b67d6a 100644 --- a/platform/centec-arm64/docker-saiserver-centec/supervisord.conf +++ b/platform/centec-arm64/docker-saiserver-centec/supervisord.conf @@ -8,21 +8,27 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:saiserver] command=/usr/sbin/saiserver -p /usr/share/sonic/hwsku/sai.profile -f /usr/share/sonic/hwsku/port_config.ini priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/platform/centec-arm64/docker-syncd-centec/supervisord.conf b/platform/centec-arm64/docker-syncd-centec/supervisord.conf index 62a283872483..e76ff9baae85 100755 --- a/platform/centec-arm64/docker-syncd-centec/supervisord.conf +++ b/platform/centec-arm64/docker-syncd-centec/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:syncd] @@ -33,7 +35,9 @@ command=/usr/bin/syncd_start.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/platform/centec/docker-saiserver-centec/supervisord.conf b/platform/centec/docker-saiserver-centec/supervisord.conf index ccb107b3d1f8..ab3bb3b67d6a 100644 --- a/platform/centec/docker-saiserver-centec/supervisord.conf +++ b/platform/centec/docker-saiserver-centec/supervisord.conf @@ -8,21 +8,27 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:saiserver] command=/usr/sbin/saiserver -p /usr/share/sonic/hwsku/sai.profile -f /usr/share/sonic/hwsku/port_config.ini priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/platform/centec/docker-syncd-centec/supervisord.conf b/platform/centec/docker-syncd-centec/supervisord.conf index 56d8b29de18f..42f6e37195b2 100644 --- a/platform/centec/docker-syncd-centec/supervisord.conf +++ b/platform/centec/docker-syncd-centec/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:syncd] @@ -33,7 +35,9 @@ command=/usr/bin/syncd_start.sh priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/platform/components/docker-gbsyncd-broncos/supervisord.conf.j2 b/platform/components/docker-gbsyncd-broncos/supervisord.conf.j2 index 2ac52c22c283..ec3453e78630 100644 --- a/platform/components/docker-gbsyncd-broncos/supervisord.conf.j2 +++ b/platform/components/docker-gbsyncd-broncos/supervisord.conf.j2 @@ -16,8 +16,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -26,8 +28,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -37,7 +41,9 @@ command=/usr/bin/dsserve -f /var/run/sswsyncd/sswgbsyncd.socket /usr/bin/syncd - priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/platform/components/docker-gbsyncd-credo/supervisord.conf.j2 b/platform/components/docker-gbsyncd-credo/supervisord.conf.j2 index 01ef324450a9..655e2b71c3d9 100644 --- a/platform/components/docker-gbsyncd-credo/supervisord.conf.j2 +++ b/platform/components/docker-gbsyncd-credo/supervisord.conf.j2 @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -45,7 +49,9 @@ command=/usr/bin/syncd -s -p /etc/sai.d/psai.profile -x /usr/share/sonic/hwsku/c priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/supervisord.conf b/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/supervisord.conf index ccb107b3d1f8..ab3bb3b67d6a 100644 --- a/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/supervisord.conf +++ b/platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/supervisord.conf @@ -8,21 +8,27 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:saiserver] command=/usr/sbin/saiserver -p /usr/share/sonic/hwsku/sai.profile -f /usr/share/sonic/hwsku/port_config.ini priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/platform/marvell-teralynx/docker-syncd-mrvl-teralynx/supervisord.conf b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx/supervisord.conf index ef84810b0cbf..ee7d59a51072 100755 --- a/platform/marvell-teralynx/docker-syncd-mrvl-teralynx/supervisord.conf +++ b/platform/marvell-teralynx/docker-syncd-mrvl-teralynx/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -44,7 +48,9 @@ command=/usr/bin/syncd_start.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/platform/marvell/docker-saiserver-mrvl/supervisord.conf b/platform/marvell/docker-saiserver-mrvl/supervisord.conf index ccb107b3d1f8..ab3bb3b67d6a 100644 --- a/platform/marvell/docker-saiserver-mrvl/supervisord.conf +++ b/platform/marvell/docker-saiserver-mrvl/supervisord.conf @@ -8,21 +8,27 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:saiserver] command=/usr/sbin/saiserver -p /usr/share/sonic/hwsku/sai.profile -f /usr/share/sonic/hwsku/port_config.ini priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/platform/marvell/docker-syncd-mrvl/supervisord.conf b/platform/marvell/docker-syncd-mrvl/supervisord.conf index 62a283872483..e76ff9baae85 100644 --- a/platform/marvell/docker-syncd-mrvl/supervisord.conf +++ b/platform/marvell/docker-syncd-mrvl/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:syncd] @@ -33,7 +35,9 @@ command=/usr/bin/syncd_start.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/platform/mellanox/docker-saiserver-mlnx/supervisord.conf b/platform/mellanox/docker-saiserver-mlnx/supervisord.conf index e90e41645042..68ca875f045a 100644 --- a/platform/mellanox/docker-saiserver-mlnx/supervisord.conf +++ b/platform/mellanox/docker-saiserver-mlnx/supervisord.conf @@ -8,21 +8,27 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:saiserver] command=/usr/sbin/saiserver -p /etc/sai/profile.ini -f /etc/sai/portmap.ini priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/platform/mellanox/docker-syncd-mlnx/supervisord.conf.j2 b/platform/mellanox/docker-syncd-mlnx/supervisord.conf.j2 index c4290d920f59..61f263294406 100644 --- a/platform/mellanox/docker-syncd-mlnx/supervisord.conf.j2 +++ b/platform/mellanox/docker-syncd-mlnx/supervisord.conf.j2 @@ -25,8 +25,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:syncd] @@ -34,8 +36,10 @@ command=/usr/bin/syncd_start.sh priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running {% if ENABLE_ASAN == "y" %} diff --git a/platform/nephos/docker-syncd-nephos/supervisord.conf b/platform/nephos/docker-syncd-nephos/supervisord.conf index 944c3be9171e..5600e25500c5 100644 --- a/platform/nephos/docker-syncd-nephos/supervisord.conf +++ b/platform/nephos/docker-syncd-nephos/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:syncd] @@ -33,7 +35,9 @@ command=/usr/bin/syncd_start.sh priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/platform/nvidia-bluefield/docker-syncd-bluefield/supervisord.conf b/platform/nvidia-bluefield/docker-syncd-bluefield/supervisord.conf index 6fd59606062d..0015bd6797aa 100644 --- a/platform/nvidia-bluefield/docker-syncd-bluefield/supervisord.conf +++ b/platform/nvidia-bluefield/docker-syncd-bluefield/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:syncd] @@ -33,7 +35,9 @@ command=/usr/bin/syncd_start.sh priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/platform/p4/docker-sonic-p4/supervisord.conf b/platform/p4/docker-sonic-p4/supervisord.conf index a4026f61c140..ca4ba0c5e2fa 100644 --- a/platform/p4/docker-sonic-p4/supervisord.conf +++ b/platform/p4/docker-sonic-p4/supervisord.conf @@ -18,124 +18,156 @@ command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:bm_router] command=ip netns exec sw_net simple_switch -i 0@router_port1 -i 250@router_cpu_port --thrift-port 9091 --log-file bm_logs/router_log --log-flush --notifications-addr ipc:///tmp/bmv2-router-notifications.ipc /usr/share/p4-sai-bm/sai_router.json priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:bm_bridge] command=ip netns exec sw_net simple_switch -i 0@sw_port0 -i 1@sw_port1 -i 2@sw_port2 -i 3@sw_port3 -i 4@sw_port4 -i 5@sw_port5 -i 6@sw_port6 -i 7@sw_port7 -i 7@sw_port7 -i 8@sw_port8 -i 9@sw_port9 -i 10@sw_port10 -i 11@sw_port11 -i 12@sw_port12 -i 13@sw_port13 -i 14@sw_port14 -i 15@sw_port15 -i 16@sw_port16 -i 17@sw_port17 -i 18@sw_port18 -i 19@sw_port19 -i 20@sw_port20 -i 21@sw_port21 -i 22@sw_port22 -i 23@sw_port23 -i 24@sw_port24 -i 25@sw_port25 -i 26@sw_port26 -i 27@sw_port27 -i 28@sw_port28 -i 29@sw_port29 -i 30@sw_port30 -i 31@sw_port31 -i 250@cpu_port -i 251@router_port0 --log-file bm_logs/bridge_log --log-flush /usr/share/p4-sai-bm/sai_bridge.json & priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:redis-server] command=/usr/bin/redis-server /etc/redis/redis.conf priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:syncd] command=/usr/bin/syncd -u autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:orchagent] command=/usr/bin/orchagent.sh priority=5 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:portsyncd] command=/usr/bin/portsyncd priority=6 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:neighsyncd] command=/usr/bin/neighsyncd priority=8 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:teamsyncd] command=/usr/bin/teamsyncd priority=9 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:vlanmgrd] command=/usr/bin/vlanmgrd priority=10 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:intfmgrd] command=/usr/bin/intfmgrd priority=11 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:zebra] command=/usr/lib/quagga/zebra -A 127.0.0.1 priority=12 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:bgpd] command=/usr/lib/quagga/bgpd -A 127.0.0.1 -F priority=13 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:fpmsyncd] command=/usr/bin/fpmsyncd priority=14 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:arp_update] command=/usr/bin/arp_update priority=15 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:fdbsyncd] command=/usr/bin/fdbsyncd priority=16 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true diff --git a/platform/pensando/docker-syncd-pensando/supervisord.conf b/platform/pensando/docker-syncd-pensando/supervisord.conf index 56d8b29de18f..42f6e37195b2 100644 --- a/platform/pensando/docker-syncd-pensando/supervisord.conf +++ b/platform/pensando/docker-syncd-pensando/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:syncd] @@ -33,7 +35,9 @@ command=/usr/bin/syncd_start.sh priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/platform/vs/docker-dash-engine/supervisord.conf b/platform/vs/docker-dash-engine/supervisord.conf index df50a2d9a633..f5df597a2a95 100644 --- a/platform/vs/docker-dash-engine/supervisord.conf +++ b/platform/vs/docker-dash-engine/supervisord.conf @@ -17,8 +17,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=true autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -27,7 +29,9 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running diff --git a/platform/vs/docker-gbsyncd-vs/supervisord.conf b/platform/vs/docker-gbsyncd-vs/supervisord.conf index b539349bcf47..ea123787723b 100644 --- a/platform/vs/docker-gbsyncd-vs/supervisord.conf +++ b/platform/vs/docker-gbsyncd-vs/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -44,7 +48,9 @@ command=/usr/bin/gbsyncdmgrd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/platform/vs/docker-sonic-vs/supervisord.conf.j2 b/platform/vs/docker-sonic-vs/supervisord.conf.j2 index 8f0524338a09..a394d29d406c 100644 --- a/platform/vs/docker-sonic-vs/supervisord.conf.j2 +++ b/platform/vs/docker-sonic-vs/supervisord.conf.j2 @@ -9,40 +9,50 @@ command=/usr/bin/start.sh priority=1 autostart=true autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:rsyslogd] command=/usr/sbin/rsyslogd -n priority=2 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:redis-server] command=/usr/bin/redis-server /etc/redis/redis.conf priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:redis-chassis] command=/bin/bash -c "{ [[ -s /var/lib/redis_chassis/dump.rdb ]] || rm -f /var/lib/redis_chassis/dump.rdb; } && mkdir -p /var/lib/redis_chassis && exec /usr/bin/redis-server /etc/redis/redis.conf --bind redis_chassis.server --port 6380 --protected-mode no --unixsocket /var/run/redis/redis_chassis.sock --pidfile /var/run/redis/redis_chassis.pid --dir /var/lib/redis_chassis" priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:syncd] command=/usr/bin/syncd_start.sh priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/syncd-asan.log{{ asan_extra_options }}" {% endif %} @@ -52,8 +62,10 @@ command=/usr/bin/syncd -s -p /usr/share/sonic/hwsku/pai.profile -x /usr/share/so priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:gearsyncd] command=/usr/bin/gearsyncd -p /usr/share/sonic/hwsku/gearbox_config.json @@ -61,16 +73,20 @@ startsecs=0 priority=5 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:portsyncd] command=/usr/bin/portsyncd priority=5 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/portsyncd-asan.log{{ asan_extra_options }}" {% endif %} @@ -80,8 +96,10 @@ command=/usr/bin/orchagent.sh priority=6 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/orchagent-asan.log{{ asan_extra_options }}" {% endif %} @@ -91,8 +109,10 @@ command=/usr/bin/coppmgrd priority=7 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/coppmgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -102,8 +122,10 @@ command=/usr/bin/neighsyncd priority=8 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/neighsyncd-asan.log{{ asan_extra_options }}" {% endif %} @@ -113,8 +135,10 @@ command=/usr/bin/teamsyncd priority=9 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/teamsyncd-asan.log{{ asan_extra_options }}" {% endif %} @@ -124,8 +148,10 @@ command=/usr/bin/vlanmgrd priority=10 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/vlanmgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -135,8 +161,10 @@ command=/usr/bin/intfmgrd priority=11 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/intfmgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -146,8 +174,10 @@ command=/usr/bin/portmgrd priority=12 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/portmgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -157,8 +187,10 @@ command=/usr/bin/teammgrd priority=12 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/teammgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -176,32 +208,40 @@ command=/usr/lib/frr/zebra -A 127.0.0.1 -s 90000000 -M dplane_fpm_sonic --asic-o priority=13 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:bgpd] command=/usr/lib/frr/bgpd -A 127.0.0.1 priority=14 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:staticd] command=/usr/lib/frr/staticd -A 127.0.0.1 priority=14 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:fpmsyncd] command=/usr/bin/fpmsyncd priority=15 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/fpmsyncd-asan.log{{ asan_extra_options }}" {% endif %} @@ -219,16 +259,20 @@ command=/usr/bin/arp_update priority=16 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:buffermgrd] command=/usr/bin/buffermgrd.sh priority=17 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/buffermgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -238,8 +282,10 @@ command=/usr/bin/vrfmgrd priority=18 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/vrfmgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -251,16 +297,20 @@ autostart=false autorestart=false startsecs=0 startretries=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true [program:nbrmgrd] command=/usr/bin/nbrmgrd priority=20 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/nbrmgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -270,8 +320,10 @@ command=/usr/bin/vxlanmgrd priority=21 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/vxlanmgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -281,8 +333,10 @@ command=/usr/bin/sflowmgrd priority=22 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/sflowmgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -292,8 +346,10 @@ command=/usr/bin/natmgrd priority=23 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/natmgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -303,8 +359,10 @@ command=/usr/bin/natsyncd priority=24 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/natsyncd-asan.log{{ asan_extra_options }}" {% endif %} @@ -314,8 +372,10 @@ command=/usr/bin/fdbsyncd priority=25 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/fdbsyncd-asan.log{{ asan_extra_options }}" {% endif %} @@ -325,8 +385,10 @@ command=/usr/bin/tunnelmgrd priority=26 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/tunnelmgrd-asan.log{{ asan_extra_options }}" {% endif %} @@ -336,8 +398,10 @@ command=/usr/bin/fabricmgrd priority=27 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true {% if ENABLE_ASAN == "y" %} environment=ASAN_OPTIONS="log_path=/var/log/asan/fabricmgrd-asan.log{{ asan_extra_options }}" {% endif %} diff --git a/platform/vs/docker-syncd-vs/supervisord.conf b/platform/vs/docker-syncd-vs/supervisord.conf index 7e18237b7dee..1bcf82989d0a 100644 --- a/platform/vs/docker-syncd-vs/supervisord.conf +++ b/platform/vs/docker-syncd-vs/supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=unexpected -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -44,7 +48,9 @@ command=/usr/bin/syncd_start.sh priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-no-ip-helper.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-no-ip-helper.supervisord.conf index c5882ad148c7..3e77a6db982c 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-no-ip-helper.supervisord.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-no-ip-helper.supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -47,8 +51,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -58,8 +64,10 @@ command=/usr/sbin/dhcp6relay priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -71,8 +79,10 @@ command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortCh priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running @@ -81,7 +91,9 @@ command=/usr/local/bin/dhcprelayd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-secondary-subnets.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-secondary-subnets.supervisord.conf index 4f28edaa4aa6..83911f477d72 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-secondary-subnets.supervisord.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay-secondary-subnets.supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -47,8 +51,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -57,8 +63,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -68,8 +76,10 @@ command=/usr/sbin/dhcp6relay priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -81,8 +91,10 @@ command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortCh priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running @@ -91,8 +103,10 @@ command=/usr/sbin/dhcpmon -id Vlan2000 -iu Vlan1000 -iu Vlan1000 -iu PortChannel priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan2000:running @@ -101,7 +115,9 @@ command=/usr/local/bin/dhcprelayd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf index d2b6e4a5637b..f88edb3e6c95 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/docker-dhcp-relay.supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -47,8 +51,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -57,8 +63,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -68,8 +76,10 @@ command=/usr/sbin/dhcp6relay priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -81,8 +91,10 @@ command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel02 -iu PortCh priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running @@ -91,8 +103,10 @@ command=/usr/sbin/dhcpmon -id Vlan2000 -iu Vlan1000 -iu PortChannel02 -iu PortCh priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan2000:running @@ -101,7 +115,9 @@ command=/usr/local/bin/dhcprelayd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-no-ip-helper.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-no-ip-helper.supervisord.conf index 80a26d8e6601..5455e6fef31a 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-no-ip-helper.supervisord.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-no-ip-helper.supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -47,8 +51,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -58,8 +64,10 @@ command=/usr/sbin/dhcp6relay priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -71,8 +79,10 @@ command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortCh priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running @@ -81,7 +91,9 @@ command=/usr/local/bin/dhcprelayd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-secondary-subnets.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-secondary-subnets.supervisord.conf index 80a172ef25a6..60c173b35e4b 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-secondary-subnets.supervisord.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay-secondary-subnets.supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -47,8 +51,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -57,8 +63,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -68,8 +76,10 @@ command=/usr/sbin/dhcp6relay priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -81,8 +91,10 @@ command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortCh priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running @@ -91,8 +103,10 @@ command=/usr/sbin/dhcpmon -id Vlan2000 -iu Vlan1000 -iu Vlan1000 -iu PortChannel priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan2000:running @@ -101,7 +115,9 @@ command=/usr/local/bin/dhcprelayd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf index dd8371b59443..3a1c79da9980 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/docker-dhcp-relay.supervisord.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -47,8 +51,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -57,8 +63,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -68,8 +76,10 @@ command=/usr/sbin/dhcp6relay priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -81,8 +91,10 @@ command=/usr/sbin/dhcpmon -id Vlan1000 -iu Vlan2000 -iu PortChannel01 -iu PortCh priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running @@ -91,8 +103,10 @@ command=/usr/sbin/dhcpmon -id Vlan2000 -iu Vlan1000 -iu PortChannel01 -iu PortCh priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan2000:running @@ -101,7 +115,9 @@ command=/usr/local/bin/dhcprelayd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited diff --git a/src/sonic-dhcp-utilities/tests/test_data/supervisor.conf b/src/sonic-dhcp-utilities/tests/test_data/supervisor.conf index e958fa35fb56..5584dc2b2f32 100644 --- a/src/sonic-dhcp-utilities/tests/test_data/supervisor.conf +++ b/src/sonic-dhcp-utilities/tests/test_data/supervisor.conf @@ -24,8 +24,10 @@ command=/usr/sbin/rsyslogd -n -iNONE priority=1 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true [program:start] @@ -34,8 +36,10 @@ priority=2 autostart=false autorestart=false startsecs=0 -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=rsyslogd:running @@ -45,8 +49,10 @@ command=/usr/sbin/dhcrelay -d -m discard -a %%h:%%p %%P --name-alias-map-file /t priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -55,8 +61,10 @@ command=/usr/local/bin/dhcprelayd priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running @@ -65,8 +73,10 @@ command=/usr/sbin/dhcp6relay priority=3 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=start:exited @@ -82,7 +92,9 @@ command=/usr/sbin/dhcpmon -id Vlan1000 -iu PortChannel101 -iu PortChannel102 -iu priority=4 autostart=false autorestart=false -stdout_logfile=syslog -stderr_logfile=syslog +stdout_logfile=NONE +stdout_syslog=true +stderr_logfile=NONE +stderr_syslog=true dependent_startup=true dependent_startup_wait_for=isc-dhcpv4-relay-Vlan1000:running