ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-02-06 11:09:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement HTTP /restful/rhizome/newsince/.../bundlelist.json

Browse Source 
Now functions as per requirements, blocks for 60 seconds sending
new bundles as they appear, sends new token with each new bundle.
Tested manually.
This commit is contained in:
Andrew Bettison 2013-11-19 15:43:51 +10:30
parent 21b10b2cb7
commit fce0893173
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf_schema.h
View File

@ -397,6 +397,7 @@ END_STRUCT
STRUCT(rhizome_api_restful) STRUCT(rhizome_api_restful)
SUB_STRUCT(userlist, users,) SUB_STRUCT(userlist, users,)
ATOM(uint32_t, newsince_timeout, 60, uint32_time_interval,, "Time to block while reporting new bundles")
END_STRUCT END_STRUCT
STRUCT(rhizome_api) STRUCT(rhizome_api)

1
rhizome.h
View File

@ -753,6 +753,7 @@ typedef struct rhizome_http_request
enum { LIST_HEADER = 0, LIST_ROWS, LIST_DONE } phase; enum { LIST_HEADER = 0, LIST_ROWS, LIST_DONE } phase;
uint64_t rowid_highest; uint64_t rowid_highest;
size_t rowcount; size_t rowcount;
time_ms_t end_time;
struct rhizome_list_cursor cursor; struct rhizome_list_cursor cursor;
} list; } list;
} u; } u;

15
rhizome_http.c
View File

@ -423,6 +423,7 @@ static int restful_rhizome_newsince(rhizome_http_request *r, const char *remaind
r->u.list.rowcount = 0; r->u.list.rowcount = 0;
bzero(&r->u.list.cursor, sizeof r->u.list.cursor); bzero(&r->u.list.cursor, sizeof r->u.list.cursor);
r->u.list.cursor.rowid_since = rowid; r->u.list.cursor.rowid_since = rowid;
r->u.list.end_time = gettime_ms() + config.rhizome.api.restful.newsince_timeout * 1000;
http_request_response_generated(&r->http, 200, "application/json", restful_rhizome_bundlelist_json_content); http_request_response_generated(&r->http, 200, "application/json", restful_rhizome_bundlelist_json_content);
return 0; return 0;
} }
@ -463,14 +464,21 @@ static int restful_rhizome_bundlelist_json_content_chunk(sqlite_retry_state *ret
int ret = rhizome_list_next(retry, &r->u.list.cursor); int ret = rhizome_list_next(retry, &r->u.list.cursor);
if (ret == -1) if (ret == -1)
return -1; return -1;
rhizome_manifest *m = r->u.list.cursor.manifest;
if (ret == 0) { if (ret == 0) {
time_ms_t now;
if (r->u.list.cursor.rowid_since == 0 || (now = gettime_ms()) >= r->u.list.end_time) {
strbuf_puts(b, "\n]\n}\n"); strbuf_puts(b, "\n]\n}\n");
if (strbuf_overrun(b)) if (!strbuf_overrun(b))
return 0;
r->u.list.phase = LIST_DONE; r->u.list.phase = LIST_DONE;
return 0; return 0;
} }
time_ms_t wake_at = now + 2000;
if (wake_at > r->u.list.end_time)
wake_at = r->u.list.end_time;
http_request_pause_response(&r->http, wake_at);
return 0;
}
rhizome_manifest *m = r->u.list.cursor.manifest;
assert(m->filesize != RHIZOME_SIZE_UNSET); assert(m->filesize != RHIZOME_SIZE_UNSET);
rhizome_lookup_author(m); rhizome_lookup_author(m);
if (r->u.list.rowcount != 0) if (r->u.list.rowcount != 0)
@ -521,7 +529,6 @@ static int restful_rhizome_bundlelist_json_content_chunk(sqlite_retry_state *ret
rhizome_list_commit(&r->u.list.cursor); rhizome_list_commit(&r->u.list.cursor);
++r->u.list.rowcount; ++r->u.list.rowcount;
} }
r->u.list.phase = LIST_ROWS;
return 1; return 1;
} }
case LIST_DONE: case LIST_DONE: