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

zebra: Give a bit more data about zclient connection on errors #17646

Merged
merged 1 commit into from
Dec 13, 2024
Merged

zebra: Give a bit more data about zclient connection on errors #17646

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 5 additions & 6 deletions zebra/zserv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,9 @@ void zserv_log_message(const char *errmsg, struct stream *msg,
*/
static void zserv_client_fail(struct zserv *client)
{
flog_warn(
EC_ZEBRA_CLIENT_IO_ERROR,
"Client '%s' (session id %d) encountered an error and is shutting down.",
zebra_route_string(client->proto), client->session_id);
flog_warn(EC_ZEBRA_CLIENT_IO_ERROR,
"Client %d '%s' (session id %d) encountered an error and is shutting down.",
client->sock, zebra_route_string(client->proto), client->session_id);

atomic_store_explicit(&client->pthread->running, false,
memory_order_relaxed);
Expand Down Expand Up @@ -468,8 +467,8 @@ static void zserv_read(struct event *thread)
}

if (IS_ZEBRA_DEBUG_PACKET)
zlog_debug("Read %d packets from client: %s. Current ibuf fifo count: %zu. Conf P2p %d",
p2p_avail - p2p, zebra_route_string(client->proto),
zlog_debug("Read %d packets from client: %s(%d). Current ibuf fifo count: %zu. Conf P2p %d",
p2p_avail - p2p, zebra_route_string(client->proto), client->sock,
client_ibuf_fifo_cnt, p2p_orig);

/* Reschedule ourselves since we have space in ibuf_fifo */
Expand Down
Loading