Skip to content

Commit

Permalink
[docker-platform-monitor] make file and supervisord conf change for n…
Browse files Browse the repository at this point in the history
…ew xcvrd deamon (#1840)

* [docker-platform-monitor] make file and supervisord conf change for new xcvrd deamon

* make file change for the new daemon
* supervisord conf change for the new daemon

signed-off-by Liu Kebo kebol@mellanox.com

* make xcvrd start sequence aligned with the supervisord conf

* update submodules to include xcvrd modification
  • Loading branch information
keboliu authored and lguohan committed Sep 6, 2018
1 parent 6293178 commit e237df8
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 2 deletions.
2 changes: 2 additions & 0 deletions dockers/docker-platform-monitor/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ if [ -e /usr/share/sonic/platform/fancontrol ]; then
fi

supervisorctl start ledd

supervisorctl start xcvrd
9 changes: 9 additions & 0 deletions dockers/docker-platform-monitor/supervisord.conf
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,12 @@ autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
startsecs=0

[program:xcvrd]
command=/usr/bin/xcvrd
priority=6
autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
startsecs=0
2 changes: 1 addition & 1 deletion rules/docker-platform-monitor.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

DOCKER_PLATFORM_MONITOR = docker-platform-monitor.gz
$(DOCKER_PLATFORM_MONITOR)_PATH = $(DOCKERS_PATH)/docker-platform-monitor
$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(SONIC_LEDD)
$(DOCKER_PLATFORM_MONITOR)_DEPENDS += $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(SONIC_LEDD) $(SONIC_XCVRD)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PLATFORM_COMMON_PY2)
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SWSSSDK_PY2)
$(DOCKER_PLATFORM_MONITOR)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE)
Expand Down
5 changes: 5 additions & 0 deletions rules/sonic-xcvrd.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# sonic-xcvrd (SONiC Transceiver monitoring daemon) Debian package

SONIC_XCVRD = python-sonic-xcvrd_1.0-1_all.deb
$(SONIC_XCVRD)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-xcvrd
SONIC_PYTHON_STDEB_DEBS += $(SONIC_XCVRD)
2 changes: 1 addition & 1 deletion src/sonic-platform-daemons

0 comments on commit e237df8

Please sign in to comment.