summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar default2023-02-07 13:19:27 +0100
committerGravatar default2023-02-07 13:19:27 +0100
commit8f63c6259ad8eb6d26eff2673a29ef469ad8e018 (patch)
treeedc49b0c30c8ecd61192e6d700cef39bae6260dc
parentOutput messages are sent with send_to_inbox_raw(). (diff)
downloadsnac2-8f63c6259ad8eb6d26eff2673a29ef469ad8e018.tar.gz
snac2-8f63c6259ad8eb6d26eff2673a29ef469ad8e018.tar.xz
snac2-8f63c6259ad8eb6d26eff2673a29ef469ad8e018.zip
Log unexpected q_item types.
-rw-r--r--activitypub.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/activitypub.c b/activitypub.c
index e87f6d5..af0a9a1 100644
--- a/activitypub.c
+++ b/activitypub.c
@@ -1126,20 +1126,20 @@ void process_user_queue_item(snac *snac, xs_dict *q_item)
1126 /* deliver */ 1126 /* deliver */
1127 status = send_to_inbox_raw(keyid, seckey, inbox, msg, &payload, &p_size, retries == 0 ? 3 : 8); 1127 status = send_to_inbox_raw(keyid, seckey, inbox, msg, &payload, &p_size, retries == 0 ? 3 : 8);
1128 1128
1129 snac_log(snac, xs_fmt("process_queue sent to inbox %s %d", inbox, status)); 1129 snac_log(snac, xs_fmt("output sent to inbox %s %d", inbox, status));
1130 1130
1131 if (!valid_status(status)) { 1131 if (!valid_status(status)) {
1132 /* error sending; requeue? */ 1132 /* error sending; requeue? */
1133 if (status == 404 || status == 410) 1133 if (status == 404 || status == 410)
1134 /* explicit error: discard */ 1134 /* explicit error: discard */
1135 snac_log(snac, xs_fmt("process_queue error %s %d", inbox, status)); 1135 snac_log(snac, xs_fmt("output error %s %d", inbox, status));
1136 else 1136 else
1137 if (retries > queue_retry_max) 1137 if (retries > queue_retry_max)
1138 snac_log(snac, xs_fmt("process_queue giving up %s %d", inbox, status)); 1138 snac_log(snac, xs_fmt("output giving up %s %d", inbox, status));
1139 else { 1139 else {
1140 /* requeue */ 1140 /* requeue */
1141 enqueue_output(snac, msg, inbox, retries + 1); 1141 enqueue_output(snac, msg, inbox, retries + 1);
1142 snac_log(snac, xs_fmt("process_queue requeue %s #%d", inbox, retries + 1)); 1142 snac_log(snac, xs_fmt("output requeue %s #%d", inbox, retries + 1));
1143 } 1143 }
1144 } 1144 }
1145 } 1145 }
@@ -1155,14 +1155,16 @@ void process_user_queue_item(snac *snac, xs_dict *q_item)
1155 1155
1156 if (!process_input_message(snac, msg, req)) { 1156 if (!process_input_message(snac, msg, req)) {
1157 if (retries > queue_retry_max) 1157 if (retries > queue_retry_max)
1158 snac_log(snac, xs_fmt("process_queue input giving up")); 1158 snac_log(snac, xs_fmt("input giving up"));
1159 else { 1159 else {
1160 /* reenqueue */ 1160 /* reenqueue */
1161 enqueue_input(snac, msg, req, retries + 1); 1161 enqueue_input(snac, msg, req, retries + 1);
1162 snac_log(snac, xs_fmt("process_queue input requeue #%d", retries + 1)); 1162 snac_log(snac, xs_fmt("input requeue #%d", retries + 1));
1163 } 1163 }
1164 } 1164 }
1165 } 1165 }
1166 else
1167 snac_log(snac, xs_fmt("unexpected q_item type '%s'", type));
1166} 1168}
1167 1169
1168 1170
@@ -1245,6 +1247,8 @@ void process_queue_item(xs_dict *q_item)
1245 1247
1246 srv_log(xs_dup("purge end")); 1248 srv_log(xs_dup("purge end"));
1247 } 1249 }
1250 else
1251 srv_log(xs_fmt("unexpected q_item type '%s'", type));
1248} 1252}
1249 1253
1250 1254