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 bcb733a..104110d 100644 --- a/activitypub.c +++ b/activitypub.c | |||
| @@ -2724,6 +2724,12 @@ int process_user_queue(snac *snac) | |||
| 2724 | } | 2724 | } |
| 2725 | 2725 | ||
| 2726 | 2726 | ||
| 2727 | xs_str *str_status(int status) | ||
| 2728 | { | ||
| 2729 | return xs_fmt("%d %s", status, status < 0 ? xs_curl_strerr(status) : http_status_text(status)); | ||
| 2730 | } | ||
| 2731 | |||
| 2732 | |||
| 2727 | void process_queue_item(xs_dict *q_item) | 2733 | void process_queue_item(xs_dict *q_item) |
| 2728 | /* processes an item from the global queue */ | 2734 | /* processes an item from the global queue */ |
| 2729 | { | 2735 | { |
| @@ -2780,7 +2786,9 @@ void process_queue_item(xs_dict *q_item) | |||
| 2780 | else | 2786 | else |
| 2781 | payload = xs_str_new(NULL); | 2787 | payload = xs_str_new(NULL); |
| 2782 | 2788 | ||
| 2783 | srv_log(xs_fmt("output message: sent to inbox %s %d%s", inbox, status, payload)); | 2789 | xs *s_status = str_status(status); |
| 2790 | |||
| 2791 | srv_log(xs_fmt("output message: sent to inbox %s (%s)%s", inbox, s_status, payload)); | ||
| 2784 | 2792 | ||
| 2785 | if (!valid_status(status)) { | 2793 | if (!valid_status(status)) { |
| 2786 | retries++; | 2794 | retries++; |
| @@ -2798,10 +2806,10 @@ void process_queue_item(xs_dict *q_item) | |||
| 2798 | || status == HTTP_STATUS_UNPROCESSABLE_CONTENT | 2806 | || status == HTTP_STATUS_UNPROCESSABLE_CONTENT |
| 2799 | || status < 0) | 2807 | || status < 0) |
| 2800 | /* explicit error: discard */ | 2808 | /* explicit error: discard */ |
| 2801 | srv_log(xs_fmt("output message: error %s %d", inbox, status)); | 2809 | srv_log(xs_fmt("output message: error %s (%s)", inbox, s_status)); |
| 2802 | else | 2810 | else |
| 2803 | if (retries > queue_retry_max) | 2811 | if (retries > queue_retry_max) |
| 2804 | srv_log(xs_fmt("output message: giving up %s %d", inbox, status)); | 2812 | srv_log(xs_fmt("output message: giving up %s (%s)", inbox, s_status)); |
| 2805 | else { | 2813 | else { |
| 2806 | /* requeue */ | 2814 | /* requeue */ |
| 2807 | enqueue_output_raw(keyid, seckey, msg, inbox, retries, status); | 2815 | enqueue_output_raw(keyid, seckey, msg, inbox, retries, status); |