commit 94c4790

Unified queue message field names.

 1@@ -1101,7 +1101,7 @@ void process_queue(snac *snac)
 2         if (strcmp(type, "output") == 0) {
 3             int status;
 4             char *inbox = xs_dict_get(q_item, "inbox");
 5-            char *msg   = xs_dict_get(q_item, "object");
 6+            char *msg   = xs_dict_get(q_item, "message");
 7             int retries = xs_number_get(xs_dict_get(q_item, "retries"));
 8             xs *payload = NULL;
 9             int p_size = 0;
10@@ -1132,10 +1132,13 @@ void process_queue(snac *snac)
11         else
12         if (strcmp(type, "input") == 0) {
13             /* process the message */
14-            char *msg = xs_dict_get(q_item, "object");
15+            char *msg = xs_dict_get(q_item, "message");
16             char *req = xs_dict_get(q_item, "req");
17             int retries = xs_number_get(xs_dict_get(q_item, "retries"));
18 
19+            if (xs_is_null(msg))
20+                continue;
21+
22             if (!process_message(snac, msg, req)) {
23                 if (retries > queue_retry_max)
24                     snac_log(snac, xs_fmt("process_queue input giving up"));

 1@@ -1299,10 +1299,9 @@ d_char *history_list(snac *snac)
 2 
 3 /** the queue **/
 4 
 5-static int _enqueue_put(char *fn, char *msg)
 6+static xs_dict *_enqueue_put(const char *fn, xs_dict *msg)
 7 /* writes safely to the queue */
 8 {
 9-    int ret = 1;
10     xs *tfn = xs_fmt("%s.tmp", fn);
11     FILE *f;
12 
13@@ -1314,10 +1313,8 @@ static int _enqueue_put(char *fn, char *msg)
14 
15         rename(tfn, fn);
16     }
17-    else
18-        ret = 0;
19 
20-    return ret;
21+    return msg;
22 }
23 
24 
25@@ -1331,11 +1328,11 @@ void enqueue_input(snac *snac, char *msg, char *req, int retries)
26     xs *rn   = xs_number_new(retries);
27 
28     qmsg = xs_dict_append(qmsg, "type",    "input");
29-    qmsg = xs_dict_append(qmsg, "object",  msg);
30+    qmsg = xs_dict_append(qmsg, "message", msg);
31     qmsg = xs_dict_append(qmsg, "req",     req);
32     qmsg = xs_dict_append(qmsg, "retries", rn);
33 
34-    _enqueue_put(fn, qmsg);
35+    qmsg = _enqueue_put(fn, qmsg);
36 
37     snac_debug(snac, 1, xs_fmt("enqueue_input %s", fn));
38 }
39@@ -1357,10 +1354,10 @@ void enqueue_output(snac *snac, char *msg, char *inbox, int retries)
40 
41     qmsg = xs_dict_append(qmsg, "type",    "output");
42     qmsg = xs_dict_append(qmsg, "inbox",   inbox);
43-    qmsg = xs_dict_append(qmsg, "object",  msg);
44+    qmsg = xs_dict_append(qmsg, "message", msg);
45     qmsg = xs_dict_append(qmsg, "retries", rn);
46 
47-    _enqueue_put(fn, qmsg);
48+    qmsg = _enqueue_put(fn, qmsg);
49 
50     snac_debug(snac, 1, xs_fmt("enqueue_output %s %s %d", inbox, fn, retries));
51 }
52@@ -1391,7 +1388,7 @@ void enqueue_email(snac *snac, char *msg, int retries)
53     qmsg = xs_dict_append(qmsg, "message", msg);
54     qmsg = xs_dict_append(qmsg, "retries", rn);
55 
56-    _enqueue_put(fn, qmsg);
57+    qmsg = _enqueue_put(fn, qmsg);
58 
59     snac_debug(snac, 1, xs_fmt("enqueue_email %d", retries));
60 }
61@@ -1408,7 +1405,7 @@ void enqueue_message(snac *snac, char *msg)
62     qmsg = xs_dict_append(qmsg, "type",    "message");
63     qmsg = xs_dict_append(qmsg, "message", msg);
64 
65-    _enqueue_put(fn, qmsg);
66+    qmsg = _enqueue_put(fn, qmsg);
67 
68     snac_debug(snac, 0, xs_fmt("enqueue_message %s", id));
69 }