Skip to content

Manually send SIGHUP to vtysh when the current session was disconnected #1801

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

Merged
merged 2 commits into from
Jun 20, 2018
Merged

Manually send SIGHUP to vtysh when the current session was disconnected #1801

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e580c9
Manually send SIGHUP to vtysh when the current session was disconnected
pavel-shirshov Jun 19, 2018
0e251f9
Address comments
pavel-shirshov Jun 19, 2018
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
16 changes: 15 additions & 1 deletion dockers/docker-fpm-frr/base_image_files/vtysh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
#!/bin/bash

docker exec -i bgp vtysh "$@"
# Determine whether stdout is on a terminal
if [ -t 1 ] ; then
# Prepare a function to send HUP signal to vtysh in the container
# we mark the new instance of vtysh with current tty as a tag
TTY=$(tty)
function cleanup
{
PID_FOR_HUP=$(docker exec -i bgp ps a | grep "vtysh $TTY" | awk '{print $1; }')
docker exec -i bgp kill -HUP $PID_FOR_HUP
}
trap cleanup HUP
docker exec -ti bgp vtysh "$TTY" "$@"
else
docker exec -i bgp vtysh "$@"
fi
16 changes: 15 additions & 1 deletion dockers/docker-fpm-quagga/base_image_files/vtysh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
#!/bin/bash

docker exec -i bgp vtysh "$@"
# Determine whether stdout is on a terminal
if [ -t 1 ] ; then
# Prepare a function to send HUP signal to vtysh in the container
# we mark the new instance of vtysh with current tty as a tag
TTY=$(tty)
function cleanup
{
PID_FOR_HUP=$(docker exec -i bgp ps a | grep "vtysh $TTY" | awk '{print $1; }')
docker exec -i bgp kill -HUP $PID_FOR_HUP
Copy link
Collaborator

@qiluo-msft qiluo-msft Jun 19, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

Use 'pkill'? #Closed

}
trap cleanup HUP
docker exec -ti bgp vtysh "$TTY" "$@"
else
docker exec -i bgp vtysh "$@"
fi