commit 8a078d7f1359fdf37e7bc18d6ace3c3579b98b33 from: Omar Polo date: Wed May 17 17:56:11 2023 UTC gotwebd: lower log priority of unexpected disconnections no need to be so loud when a client disconnects earlier than expected, log it only in verbose mode. Don't log GOT_ERR_CANCELLED too since that is only used to communicate the callers that we need to stop. ok stsp@ commit - 9cd447eb681a736f222bbe134ca37c1fb30cfa89 commit + 8a078d7f1359fdf37e7bc18d6ace3c3579b98b33 blob - 7ef1dc685a64c90fa69ff126536248ae78ed21dc blob + 439dc44795355724c9f4c3a27e86dd2db4e3539b --- gotwebd/fcgi.c +++ gotwebd/fcgi.c @@ -435,7 +435,8 @@ send_response(struct request *c, int type, const uint8 nanosleep(&ts, NULL); continue; } - log_warn("%s: write failure", __func__); + log_debug("%s: write failure: %s", __func__, + strerror(errno)); c->sock->client_status = CLIENT_DISCONNECT; return -1; } blob - 29ec61186a821e0c8822b71b3de449927f04af1c blob + ed987b10276ab43077d34ad182e40d494811d709 --- gotwebd/got_operations.c +++ gotwebd/got_operations.c @@ -782,7 +782,8 @@ got_output_repo_tree(struct request *c, free(commit_id); free(tree_id); if (error) { - log_warnx("%s: %s", __func__, error->msg); + if (error->code != GOT_ERR_CANCELLED) + log_warnx("%s: %s", __func__, error->msg); return -1; } return 0; @@ -901,8 +902,9 @@ got_output_blob_by_lines(struct template *tp, struct g free(line); if (err) { - log_warnx("%s: got_object_blob_getline failed: %s", - __func__, err->msg); + if (err->code != GOT_ERR_CANCELLED) + log_warnx("%s: got_object_blob_getline failed: %s", + __func__, err->msg); return -1; } return 0; blob - 8fe5040921e4af979d40b487a1e97faf222e21d6 blob + d610355a3f139a7aca01158af898f744596634e1 --- gotwebd/pages.tmpl +++ gotwebd/pages.tmpl @@ -919,11 +919,11 @@ static inline int rss_author(struct template *, char * {{ "\n" }} {! err = got_output_file_blame(c, &blame_line); - if (err) { + if (err && err->code != GOT_ERR_CANCELLED) log_warnx("%s: got_output_file_blame: %s", __func__, err->msg); + if (err) return (-1); - } !}