commit aa2aecab69ed4f6ff9ab2a5bb7e32109cf95aefc from: Omar Polo via: Thomas Adam date: Thu May 25 11:33:07 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 - 00ddec2f20c1ce1b0136a7ae54efb790069126ec commit + aa2aecab69ed4f6ff9ab2a5bb7e32109cf95aefc blob - a86029ab9bdf600070dee0af486d4a0f7f5e7e5a blob + 14e517f95dc558a15f4d00656168eade8bc25fa5 --- gotwebd/fcgi.c +++ gotwebd/fcgi.c @@ -437,7 +437,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 - 174ba7eab89a1c47ff87463259bd3f2a8faf9b3f blob + 7a98944b00d81ef90ba04bd4b7c8ba9f024d2d59 --- 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 - 8b26bcbc96871b207e0845e9f22006c1e15bcad8 blob + 0bea5551736c5e088e5b1ade95808a90b461d63b --- 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); - } !}