Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Fix rsyslogd start failed cause by rsyslog.conf is emtpy. #13669

Merged
merged 4 commits into from
Feb 6, 2023
Merged

Fix rsyslogd start failed cause by rsyslog.conf is emtpy. #13669

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc420ec
If sonic-cfggen exec failed, do not update rsyslog.conf.
lerry-lee Feb 6, 2023
e96e18a
If sonic-cfggen exec failed use '-d', remote '-d' and use default val…
lerry-lee Feb 6, 2023
a8ebc77
If sonic-cfggen exec failed use '-d', remote '-d' and use default val…
lerry-lee Feb 6, 2023
ee80ea8
update
lerry-lee Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion files/build_templates/docker_image_ctl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,19 @@ function updateSyslogConf()
fi
CONTAINER_NAME="$DOCKERNAME"
TMP_FILE="/tmp/rsyslog.$CONTAINER_NAME.conf"
failed="false"
{%- if docker_container_name == "database" %}
python -c "import jinja2, os; paths=['/usr/share/sonic/templates']; loader = jinja2.FileSystemLoader(paths); env = jinja2.Environment(loader=loader, trim_blocks=True); template_file='/usr/share/sonic/templates/rsyslog-container.conf.j2'; template = env.get_template(os.path.basename(template_file)); data=template.render({\"target_ip\":\"$TARGET_IP\",\"container_name\":\"$CONTAINER_NAME\"}); print(data)" > $TMP_FILE
{%- else %}
sonic-cfggen -d -t /usr/share/sonic/templates/rsyslog-container.conf.j2 -a "{\"target_ip\": \"$TARGET_IP\", \"container_name\": \"$CONTAINER_NAME\" }" > $TMP_FILE
if [ $? -ne 0 ]; then
echo "Error: Execute sonic-cfggen failed."
failed="true"
fi
{%- endif %}
docker cp $TMP_FILE ${DOCKERNAME}:/etc/rsyslog.conf
if [ "$failed" == "false" ]; then
docker cp $TMP_FILE ${DOCKERNAME}:/etc/rsyslog.conf
fi
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a risk that teamd container started without proper rsyslog.conf file. Then probably the log of teamd container can't be received by the host rsyslog service. The consequence is that teamd syslog could be missing.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the reminder! Will discuss and improve again.

rm -rf $TMP_FILE
}
function ebtables_config()
Expand Down