summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar default2022-11-17 10:16:54 +0100
committerGravatar default2022-11-17 10:16:54 +0100
commita12da31bdf680bffab98af9740a572854318f80b (patch)
treef51229326d766079fabe640eb62cc54ff22f1ffd
parentAlso log the inbox in send_to_actor(). (diff)
downloadsnac2-a12da31bdf680bffab98af9740a572854318f80b.tar.gz
snac2-a12da31bdf680bffab98af9740a572854318f80b.tar.xz
snac2-a12da31bdf680bffab98af9740a572854318f80b.zip
Move send to actor logging to process_queue().
-rw-r--r--activitypub.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/activitypub.c b/activitypub.c
index 96737ea..0f801f7 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -162,8 +162,6 @@ int send_to_actor(snac *snac, char *actor, char *msg, d_char **payload, int *p_s
162 if (!xs_is_null(inbox)) 162 if (!xs_is_null(inbox))
163 status = send_to_inbox(snac, inbox, msg, payload, p_size); 163 status = send_to_inbox(snac, inbox, msg, payload, p_size);
164 164
165 snac_log(snac, xs_fmt("send_to_actor %s (%s) %d", actor, inbox, status));
166
167 return status; 165 return status;
168} 166}
169 167
@@ -942,15 +940,17 @@ void process_queue(snac *snac)
942 status = send_to_actor(snac, actor, msg, &payload, &p_size); 940 status = send_to_actor(snac, actor, msg, &payload, &p_size);
943 941
944 if (!valid_status(status)) { 942 if (!valid_status(status)) {
945 /* error sending; reenqueue? */ 943 /* error sending; requeue? */
946 if (retries > queue_retry_max) 944 if (retries > queue_retry_max)
947 snac_log(snac, xs_fmt("process_queue giving up %s %d", actor, status)); 945 snac_log(snac, xs_fmt("process_queue giving up %s %d", actor, status));
948 else { 946 else {
949 /* reenqueue */ 947 /* requeue */
950 enqueue_output(snac, msg, actor, retries + 1); 948 enqueue_output(snac, msg, actor, retries + 1);
951 snac_log(snac, xs_fmt("process_queue requeue %s %d", actor, retries + 1)); 949 snac_log(snac, xs_fmt("process_queue requeue %s %d", actor, retries + 1));
952 } 950 }
953 } 951 }
952 else
953 snac_log(snac, xs_fmt("process_queue sent to actor %s %d", actor, status));
954 } 954 }
955 else 955 else
956 if (strcmp(type, "input") == 0) { 956 if (strcmp(type, "input") == 0) {