SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journal-importer: Consider ECONNRESET as EOF

Browse Source 
Otherwise we log a noisy error when we get ECONNRESET.
This commit is contained in:
Daan De Meyer
2024-05-16 19:23:56 +08:00
committed by Mike Yuan
parent 2e93331605
commit 2540036979
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/journal-importer.c
+12 -2
View File
@@ -93,7 +93,12 @@ static int get_line(JournalImporter *imp, char **line, size_t *size) {
imp->buf + imp->filled,
MALLOC_SIZEOF_SAFE(imp->buf) - imp->filled);
if (n < 0) {
if (errno != EAGAIN)
if (ERRNO_IS_DISCONNECT(errno)) {
log_debug_errno(errno, "Got disconnect for importer %s.", strna(imp->name));
return 0;
}
if (!ERRNO_IS_TRANSIENT(errno))
log_error_errno(errno, "read(%d, ..., %zu): %m",
imp->fd,
MALLOC_SIZEOF_SAFE(imp->buf) - imp->filled);
@@ -134,7 +139,12 @@ static int fill_fixed_size(JournalImporter *imp, void **data, size_t size) {
n = read(imp->fd, imp->buf + imp->filled,
MALLOC_SIZEOF_SAFE(imp->buf) - imp->filled);
if (n < 0) {
if (errno != EAGAIN)
if (ERRNO_IS_DISCONNECT(errno)) {
log_debug_errno(errno, "Got disconnect for importer %s.", strna(imp->name));
return 0;
}
if (!ERRNO_IS_TRANSIENT(errno))
log_error_errno(errno, "read(%d, ..., %zu): %m", imp->fd,
MALLOC_SIZEOF_SAFE(imp->buf) - imp->filled);
return -errno;