kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 08:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ast_careful_fwrite to support EPIPE gracefully" into 13

Browse Source
This commit is contained in:
Joshua Colp
2017-01-30 11:52:05 -06:00
committed by Gerrit Code Review
parent fd3f69cd05 555e8cd2ba
commit d2f30f0225
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/utils.c
View File

@@ -1453,7 +1453,9 @@ int ast_careful_fwrite(FILE *f, int fd, const char *src, size_t len, int timeout
if (ferror(f) && errno != EINTR && errno != EAGAIN) { if (ferror(f) && errno != EINTR && errno != EAGAIN) {
/* fatal error from fwrite() */ /* fatal error from fwrite() */
if (!feof(f)) { if (errno == EPIPE) {
ast_debug(1, "fwrite() failed due to reading end being closed: EPIPE\n");
} else if (!feof(f)) {
/* Don't spam the logs if it was just that the connection is closed. */ /* Don't spam the logs if it was just that the connection is closed. */
ast_log(LOG_ERROR, "fwrite() returned error: %s\n", strerror(errno)); ast_log(LOG_ERROR, "fwrite() returned error: %s\n", strerror(errno));
} }
@@ -1486,9 +1488,13 @@ int ast_careful_fwrite(FILE *f, int fd, const char *src, size_t len, int timeout
continue; continue;
} }
if (errno && !feof(f)) { if (errno && !feof(f)) {
if (errno == EPIPE) {
ast_debug(1, "fflush() failed due to reading end being closed: EPIPE\n");
} else {
/* Don't spam the logs if it was just that the connection is closed. */ /* Don't spam the logs if it was just that the connection is closed. */
ast_log(LOG_ERROR, "fflush() returned error: %s\n", strerror(errno)); ast_log(LOG_ERROR, "fflush() returned error: %s\n", strerror(errno));
} }
}
n = -1; n = -1;
break; break;
} }