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

Merge cc29dd91ab into 610685d27b

Browse Source
This commit is contained in:
Junchao-Mellanox 2024-03-25 11:10:22 +08:00 committed by GitHub
commit a0c8c606fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/sonic-containercfgd/containercfgd/containercfgd.py
View File

@ -23,6 +23,7 @@ SYSLOG_RATE_LIMIT_BURST = 'rate_limit_burst'
# Container name # Container name
container_name = None container_name = None
service_name = None
def run_command(command): def run_command(command):
@ -117,7 +118,7 @@ class SyslogHandler:
data (dict): Data of the entry: {<field_name>: <field_value>} data (dict): Data of the entry: {<field_name>: <field_value>}
""" """
try: try:
if key != container_name: if key != service_name:
return return
self.update_syslog_config(data) self.update_syslog_config(data)
except Exception as e: except Exception as e:
@ -130,8 +131,8 @@ class SyslogHandler:
init_data (dict): Initial data when first time connecting to CONFIG DB. {<table_name>: {<field_name>: <field_value>}} init_data (dict): Initial data when first time connecting to CONFIG DB. {<table_name>: {<field_name>: <field_value>}}
""" """
if SYSLOG_CONFIG_FEATURE_TABLE in init_data: if SYSLOG_CONFIG_FEATURE_TABLE in init_data:
if container_name in init_data[SYSLOG_CONFIG_FEATURE_TABLE]: if service_name in init_data[SYSLOG_CONFIG_FEATURE_TABLE]:
self.update_syslog_config(init_data[SYSLOG_CONFIG_FEATURE_TABLE][container_name]) self.update_syslog_config(init_data[SYSLOG_CONFIG_FEATURE_TABLE][service_name])
def update_syslog_config(self, data): def update_syslog_config(self, data):
"""Parse existing syslog conf and apply new syslog conf. """Parse existing syslog conf and apply new syslog conf.
@ -185,7 +186,13 @@ class SyslogHandler:
def main(): def main():
global container_name global container_name
global service_name
namespace_id = os.environ['NAMESPACE_ID']
container_name = os.environ['CONTAINER_NAME'] container_name = os.environ['CONTAINER_NAME']
if not namespace_id:
service_name = container_name
else:
service_name = container_name.rstrip(namespace_id)
daemon = ContainerConfigDaemon() daemon = ContainerConfigDaemon()
daemon.run() daemon.run()

1
src/sonic-containercfgd/tests/test_syslog_config.py
View File

@ -12,6 +12,7 @@ sys.path.insert(0, modules_path)
from containercfgd import containercfgd from containercfgd import containercfgd
containercfgd.container_name = 'swss' containercfgd.container_name = 'swss'
containercfgd.service_name = 'swss'
def test_handle_config(): def test_handle_config():