Kouhei Sutou
null+****@clear*****
Tue Apr 19 10:26:52 JST 2016
Kouhei Sutou 2016-04-19 10:26:52 +0900 (Tue, 19 Apr 2016) New Revision: 6e249e5db5684b3090a4640190e17c509fcae2a6 https://github.com/groonga/groonga/commit/6e249e5db5684b3090a4640190e17c509fcae2a6 Message: suggest: fix wrong error check Combination of groonga-suggest-httpd and groonga-suggest-learner didn't work for a long time... Modified files: src/suggest/groonga_suggest_httpd.c src/suggest/groonga_suggest_learner.c Modified: src/suggest/groonga_suggest_httpd.c (+2 -2) =================================================================== --- src/suggest/groonga_suggest_httpd.c 2016-04-18 13:48:39 +0900 (f312728) +++ src/suggest/groonga_suggest_httpd.c 2016-04-19 10:26:52 +0900 (d42ead2) @@ -212,7 +212,7 @@ log_send(struct evkeyvalq *output_headers, struct evbuffer *res_buf, zmq_msg_t msg; if (!zmq_msg_init_size(&msg, sbuf.size)) { memcpy((void *)zmq_msg_data(&msg), sbuf.data, sbuf.size); - if (zmq_msg_send(&msg, thd->zmq_sock, 0)) { + if (zmq_msg_send(&msg, thd->zmq_sock, 0) == -1) { print_error("zmq_msg_send() error"); } zmq_msg_close(&msg); @@ -512,7 +512,7 @@ recv_handler(grn_ctx *ctx, void *zmq_recv_sock, msgpack_zone *mempool, grn_obj * if (zmq_msg_init(&msg)) { print_error("cannot init zmq message."); } else { - if (zmq_msg_recv(&msg, zmq_recv_sock, 0)) { + if (zmq_msg_recv(&msg, zmq_recv_sock, 0) == -1) { print_error("cannot recv zmq message."); } else { msgpack_object obj; Modified: src/suggest/groonga_suggest_learner.c (+2 -2) =================================================================== --- src/suggest/groonga_suggest_learner.c 2016-04-18 13:48:39 +0900 (03d889f) +++ src/suggest/groonga_suggest_learner.c 2016-04-19 10:26:52 +0900 (74465be) @@ -207,7 +207,7 @@ zmq_send_to_httpd(void *zmq_send_sock, void *data, size_t size) zmq_msg_t msg; if (!zmq_msg_init_size(&msg, size)) { memcpy((void *)zmq_msg_data(&msg), data, size); - if (zmq_msg_send(&msg, zmq_send_sock, 0)) { + if (zmq_msg_send(&msg, zmq_send_sock, 0) == -1) { print_error("zmq_send() error"); return -1; } @@ -481,7 +481,7 @@ recv_event_loop(msgpack_zone *mempool, void *zmq_sock, grn_ctx *ctx) if (zmq_msg_init(&msg)) { print_error("cannot init zmq message."); } else { - if (zmq_msg_recv(&msg, zmq_sock, 0)) { + if (zmq_msg_recv(&msg, zmq_sock, 0) == -1) { print_error("cannot recv zmq message."); } else { msgpack_object obj; -------------- next part -------------- HTML����������������������������...Download
