From 7525fea666d31522434a5259aa8b62b9162bc67b Mon Sep 17 00:00:00 2001 From: Dong Zhang <41927498+dzhangalibaba@users.noreply.github.com> Date: Mon, 8 Jun 2020 13:36:56 -0700 Subject: [PATCH] [MultiDB] daemon base should use multiDB DBConnector (#4549) * [MultiDB] daemon base should use multiDB DBConnector * [sonic-platform-daemon] update submodule for multiDB changes --- .../sonic_daemon_base/daemon_base.py | 14 ++++---------- src/sonic-platform-daemons | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/sonic-daemon-base/sonic_daemon_base/daemon_base.py b/src/sonic-daemon-base/sonic_daemon_base/daemon_base.py index d3807bf915..0d532a85c1 100644 --- a/src/sonic-daemon-base/sonic_daemon_base/daemon_base.py +++ b/src/sonic-daemon-base/sonic_daemon_base/daemon_base.py @@ -14,11 +14,6 @@ except ImportError, e: # Constants ==================================================================== # -# Redis DB information -REDIS_HOSTNAME = 'localhost' -REDIS_PORT = 6379 -REDIS_TIMEOUT_MSECS = 0 - # Platform root directory inside docker PLATFORM_ROOT_DOCKER = '/usr/share/sonic/platform' SONIC_CFGGEN_PATH = '/usr/local/bin/sonic-cfggen' @@ -36,12 +31,11 @@ EEPROM_CLASS_NAME = 'board' # Helper functions ============================================================= # -def db_connect(db): +def db_connect(db_name): from swsscommon import swsscommon - return swsscommon.DBConnector(db, - REDIS_HOSTNAME, - REDIS_PORT, - REDIS_TIMEOUT_MSECS) + return swsscommon.DBConnector(db_name, + REDIS_TIMEOUT_MSECS, + True) # # Helper classes =============================================================== diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons index 6e975f5f61..0f4fd835f3 160000 --- a/src/sonic-platform-daemons +++ b/src/sonic-platform-daemons @@ -1 +1 @@ -Subproject commit 6e975f5f61111d399f5f5b44177bba8b4be8162c +Subproject commit 0f4fd835f324cb754a8b955f9a5fad6b54d7d6dc