diff options
Diffstat (limited to 'activitypub.c')
| -rw-r--r-- | activitypub.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/activitypub.c b/activitypub.c index 643baba..e2519e6 100644 --- a/activitypub.c +++ b/activitypub.c | |||
| @@ -2715,6 +2715,12 @@ int process_user_queue(snac *snac) | |||
| 2715 | } | 2715 | } |
| 2716 | 2716 | ||
| 2717 | 2717 | ||
| 2718 | xs_str *str_status(int status) | ||
| 2719 | { | ||
| 2720 | return xs_fmt("%d %s", status, status < 0 ? xs_curl_strerr(status) : http_status_text(status)); | ||
| 2721 | } | ||
| 2722 | |||
| 2723 | |||
| 2718 | void process_queue_item(xs_dict *q_item) | 2724 | void process_queue_item(xs_dict *q_item) |
| 2719 | /* processes an item from the global queue */ | 2725 | /* processes an item from the global queue */ |
| 2720 | { | 2726 | { |
| @@ -2771,7 +2777,9 @@ void process_queue_item(xs_dict *q_item) | |||
| 2771 | else | 2777 | else |
| 2772 | payload = xs_str_new(NULL); | 2778 | payload = xs_str_new(NULL); |
| 2773 | 2779 | ||
| 2774 | srv_log(xs_fmt("output message: sent to inbox %s %d%s", inbox, status, payload)); | 2780 | xs *s_status = str_status(status); |
| 2781 | |||
| 2782 | srv_log(xs_fmt("output message: sent to inbox %s (%s)%s", inbox, s_status, payload)); | ||
| 2775 | 2783 | ||
| 2776 | if (!valid_status(status)) { | 2784 | if (!valid_status(status)) { |
| 2777 | retries++; | 2785 | retries++; |
| @@ -2789,10 +2797,10 @@ void process_queue_item(xs_dict *q_item) | |||
| 2789 | || status == HTTP_STATUS_UNPROCESSABLE_CONTENT | 2797 | || status == HTTP_STATUS_UNPROCESSABLE_CONTENT |
| 2790 | || status < 0) | 2798 | || status < 0) |
| 2791 | /* explicit error: discard */ | 2799 | /* explicit error: discard */ |
| 2792 | srv_log(xs_fmt("output message: error %s %d", inbox, status)); | 2800 | srv_log(xs_fmt("output message: error %s (%s)", inbox, s_status)); |
| 2793 | else | 2801 | else |
| 2794 | if (retries > queue_retry_max) | 2802 | if (retries > queue_retry_max) |
| 2795 | srv_log(xs_fmt("output message: giving up %s %d", inbox, status)); | 2803 | srv_log(xs_fmt("output message: giving up %s (%s)", inbox, s_status)); |
| 2796 | else { | 2804 | else { |
| 2797 | /* requeue */ | 2805 | /* requeue */ |
| 2798 | enqueue_output_raw(keyid, seckey, msg, inbox, retries, status); | 2806 | enqueue_output_raw(keyid, seckey, msg, inbox, retries, status); |