diff options
| author | Simon Rettberg | 2020-03-14 15:09:11 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2020-03-14 15:09:11 +0100 |
| commit | eddfdc8482b8d28c263d1b1f85e6d5e4badc49ed (patch) | |
| tree | a16bf70990d6c15f08725e9e2ed4f7537a599c10 /src/server/uplink.c | |
| parent | [SERVER] Check server version before setting hopCount field (diff) | |
| download | dnbd3-eddfdc8482b8d28c263d1b1f85e6d5e4badc49ed.tar.gz dnbd3-eddfdc8482b8d28c263d1b1f85e6d5e4badc49ed.tar.xz dnbd3-eddfdc8482b8d28c263d1b1f85e6d5e4badc49ed.zip | |
[SERVER] Use image:rid in log messages
Diffstat (limited to 'src/server/uplink.c')
| -rw-r--r-- | src/server/uplink.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/uplink.c b/src/server/uplink.c index b01df58..efe7fa0 100644 --- a/src/server/uplink.c +++ b/src/server/uplink.c @@ -895,19 +895,19 @@ static void uplink_handleReceive(dnbd3_uplink_t *uplink) if ( unlikely( ret == REPLY_INTR ) && likely( !_shutdown && !uplink->shutdown ) ) continue; if ( ret == REPLY_AGAIN ) break; if ( unlikely( ret == REPLY_CLOSED ) ) { - logadd( LOG_INFO, "Uplink: Remote host hung up (%s)", uplink->image->path ); + logadd( LOG_INFO, "Uplink: Remote host hung up (%s:%d)", PIMG(uplink->image) ); goto error_cleanup; } if ( unlikely( ret == REPLY_WRONGMAGIC ) ) { - logadd( LOG_WARNING, "Uplink server's packet did not start with dnbd3_packet_magic (%s)", uplink->image->path ); + logadd( LOG_WARNING, "Uplink server's packet did not start with dnbd3_packet_magic (%s:%d)", PIMG(uplink->image) ); goto error_cleanup; } if ( unlikely( ret != REPLY_OK ) ) { - logadd( LOG_INFO, "Uplink: Connection error %d (%s)", ret, uplink->image->path ); + logadd( LOG_INFO, "Uplink: Connection error %d (%s:%d)", ret, PIMG(uplink->image) ); goto error_cleanup; } if ( unlikely( inReply.size > (uint32_t)_maxPayload ) ) { - logadd( LOG_WARNING, "Pure evil: Uplink server sent too much payload (%" PRIu32 ") for %s", inReply.size, uplink->image->path ); + logadd( LOG_WARNING, "Pure evil: Uplink server sent too much payload (%" PRIu32 ") for %s:%d", inReply.size, PIMG(uplink->image) ); goto error_cleanup; } @@ -920,7 +920,7 @@ static void uplink_handleReceive(dnbd3_uplink_t *uplink) } } if ( unlikely( (uint32_t)sock_recv( uplink->current.fd, uplink->recvBuffer, inReply.size ) != inReply.size ) ) { - logadd( LOG_INFO, "Lost connection to uplink server of %s (payload)", uplink->image->path ); + logadd( LOG_INFO, "Lost connection to uplink server of %s:%d (payload)", PIMG(uplink->image) ); goto error_cleanup; } // Payload read completely |