kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FS-9302 [mod_mongo] mongo_find_one and mongo_find_n corrected to return -ERR when connection to database fails.

This commit is contained in:
Chris Rienzo 2016-06-27 17:23:40 -04:00
parent 21bfc317f1
commit 4f2c4124d1
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mod/applications/mod_mongo/mod_mongo.c
View File

@ -251,23 +251,30 @@ SWITCH_STANDARD_API(mod_mongo_find_n_function)
mongoc_cursor_t *cursor = mongoc_collection_find(col, query_options, 0, n, 0, query, fields, NULL); mongoc_cursor_t *cursor = mongoc_collection_find(col, query_options, 0, n, 0, query, fields, NULL);
if (cursor && !mongoc_cursor_error(cursor, &error)) { if (cursor && !mongoc_cursor_error(cursor, &error)) {
/* get results from cursor */ /* get results from cursor */
switch_stream_handle_t result_stream = { 0 };
const bson_t *result; const bson_t *result;
stream->write_function(stream, "-OK\n["); SWITCH_STANDARD_STREAM(result_stream);
if (mongoc_cursor_more(cursor) && mongoc_cursor_next(cursor, &result)) { if (mongoc_cursor_more(cursor) && mongoc_cursor_next(cursor, &result)) {
char *json_result; char *json_result;
json_result = bson_as_json(result, NULL); json_result = bson_as_json(result, NULL);
stream->write_function(stream, "%s", json_result); result_stream.write_function(&result_stream, "%s", json_result);
bson_free(json_result); bson_free(json_result);
} }
while (mongoc_cursor_more(cursor) && mongoc_cursor_next(cursor, &result)) { while (mongoc_cursor_more(cursor) && mongoc_cursor_next(cursor, &result)) {
char *json_result; char *json_result;
json_result = bson_as_json(result, NULL); json_result = bson_as_json(result, NULL);
stream->write_function(stream, ",%s", json_result); result_stream.write_function(&result_stream, ",%s", json_result);
bson_free(json_result); bson_free(json_result);
} }
stream->write_function(stream, "]\n"); if (!mongoc_cursor_error(cursor, &error)) {
stream->write_function(stream, "-OK\n[%s]", zstr((char *)result_stream.data) ? "" :(char *)result_stream.data);
} else {
stream->write_function(stream, "-ERR\nquery failed: %s", error.message);
}
switch_safe_free(result_stream.data);
} else { } else {
stream->write_function(stream, "-ERR\nquery failed!\n"); stream->write_function(stream, "-ERR\nquery failed: %s", error.message);
} }
if (cursor) { if (cursor) {
mongoc_cursor_destroy(cursor); mongoc_cursor_destroy(cursor);
@ -342,6 +349,8 @@ SWITCH_STANDARD_API(mod_mongo_find_one_function)
json_result = bson_as_json(result, NULL); json_result = bson_as_json(result, NULL);
stream->write_function(stream, "-OK\n%s\n", json_result); stream->write_function(stream, "-OK\n%s\n", json_result);
bson_free(json_result); bson_free(json_result);
} else if (mongoc_cursor_error(cursor, &error)) {
stream->write_function(stream, "-ERR\nquery failed: %s\n", error.message);
} else { } else {
/* empty set */ /* empty set */
stream->write_function(stream, "-OK\n{}\n"); stream->write_function(stream, "-OK\n{}\n");