commit 349d660
default
·
2025-02-17 07:13:39 +0000 UTC
parent 3844bbf
Show the POST status also as string.
2 files changed,
+22,
-3
+11,
-3
1@@ -2724,6 +2724,12 @@ int process_user_queue(snac *snac)
2 }
3
4
5+xs_str *str_status(int status)
6+{
7+ return xs_fmt("%d %s", status, status < 0 ? xs_curl_strerr(status) : http_status_text(status));
8+}
9+
10+
11 void process_queue_item(xs_dict *q_item)
12 /* processes an item from the global queue */
13 {
14@@ -2780,7 +2786,9 @@ void process_queue_item(xs_dict *q_item)
15 else
16 payload = xs_str_new(NULL);
17
18- srv_log(xs_fmt("output message: sent to inbox %s %d%s", inbox, status, payload));
19+ xs *s_status = str_status(status);
20+
21+ srv_log(xs_fmt("output message: sent to inbox %s (%s)%s", inbox, s_status, payload));
22
23 if (!valid_status(status)) {
24 retries++;
25@@ -2798,10 +2806,10 @@ void process_queue_item(xs_dict *q_item)
26 || status == HTTP_STATUS_UNPROCESSABLE_CONTENT
27 || status < 0)
28 /* explicit error: discard */
29- srv_log(xs_fmt("output message: error %s %d", inbox, status));
30+ srv_log(xs_fmt("output message: error %s (%s)", inbox, s_status));
31 else
32 if (retries > queue_retry_max)
33- srv_log(xs_fmt("output message: giving up %s %d", inbox, status));
34+ srv_log(xs_fmt("output message: giving up %s (%s)", inbox, s_status));
35 else {
36 /* requeue */
37 enqueue_output_raw(keyid, seckey, msg, inbox, retries, status);
+11,
-0
1@@ -9,6 +9,8 @@ xs_dict *xs_http_request(const char *method, const char *url,
2 const xs_str *body, int b_size, int *status,
3 xs_str **payload, int *p_size, int timeout);
4
5+const char *xs_curl_strerr(int errnum);
6+
7 #ifdef XS_IMPLEMENTATION
8
9 #include <curl/curl.h>
10@@ -194,6 +196,15 @@ xs_dict *xs_http_request(const char *method, const char *url,
11 return response;
12 }
13
14+
15+const char *xs_curl_strerr(int errnum)
16+{
17+ CURLcode cc = errnum < 0 ? -errnum : errnum;
18+
19+ return curl_easy_strerror(cc);
20+}
21+
22+
23 #endif /* XS_IMPLEMENTATION */
24
25 #endif /* _XS_CURL_H */