X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_ws.c;h=4549d92c8ab4b2855cae533459e9b5062ca08198;hb=a7dfd8274a4ba68abc4971a46d173ca1b4ae22c8;hp=09e9edec9212015644eacad0e88e74bab67e62a5;hpb=74fc2b9b120839961cd0a4d25b4c77138994be16;p=ppastats.git diff --git a/src/lp_ws.c b/src/lp_ws.c index 09e9ede..4549d92 100644 --- a/src/lp_ws.c +++ b/src/lp_ws.c @@ -1,38 +1,45 @@ /* - Copyright (C) 2011 jeanfi@gmail.com - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ + * Copyright (C) 2011-2012 jeanfi@gmail.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include +#define _(String) gettext(String) #include #include +#include #include #include #include "cache.h" +#include "list.h" +#include "log.h" #include "lp_ws.h" #include "lp_json.h" #include "ppastats.h" -#define QUERY_GET_PUBLISHED_BINARIES \ - "?ws.op=getPublishedBinaries" -#define QUERY_GET_DOWNLOAD_COUNT "?ws.op=getDownloadCount" -#define QUERY_GET_DAILY_DOWNLOAD_TOTALS \ - "?ws.op=getDailyDownloadTotals" +static const char *QUERY_GET_PUBLISHED_BINARIES = "?ws.op=getPublishedBinaries"; +static const char *QUERY_GET_DOWNLOAD_COUNT = "?ws.op=getDownloadCount"; +static const char * +QUERY_GET_DAILY_DOWNLOAD_TOTALS = "?ws.op=getDailyDownloadTotals"; + +static const int DEFAULT_FETCH_RETRIES = 3; static CURL *curl; @@ -58,13 +65,14 @@ static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp) static char *fetch_url(const char *url) { struct ucontent *content = malloc(sizeof(struct ucontent)); - char *result = NULL; + char *result; long code; + int retries; - if (debug) - printf("DEBUG: fetch_url %s\n", url); + log_debug(_("fetch_url(): %s"), url); if (!curl) { + log_debug(_("initializing CURL")); curl_global_init(CURL_GLOBAL_ALL); curl = curl_easy_init(); } @@ -72,6 +80,11 @@ static char *fetch_url(const char *url) if (!curl) exit(EXIT_FAILURE); + result = NULL; + + retries = DEFAULT_FETCH_RETRIES; + + retrieve: content->data = malloc(1); content->data[0] = '\0'; content->len = 0; @@ -83,10 +96,32 @@ static char *fetch_url(const char *url) curl_easy_setopt(curl, CURLOPT_USERAGENT, "ppastats/0.0"); if (curl_easy_perform(curl) == CURLE_OK) { - curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code); - if (code == 200) + + switch (code) { + case 200: result = content->data; + break; + case 500: + case 502: + case 503: + case 504: + if (retries) { + log_err(_("Fetch failed with code %ld " + "for URL %s"), + code, + url); + + log_debug(_("Wait 5s before retry")); + sleep(5); + + free(content->data); + retries--; + goto retrieve; + } + default: + log_err(_("Fetch failed: %ld"), code); + } } if (!result) @@ -115,38 +150,51 @@ static json_object *get_json_object(const char *url) return NULL; } +#define json_object_to_bpph_list \ +json_object_to_binary_package_publishing_history_list + struct binary_package_publishing_history * * get_binary_package_publishing_history_list(const char *archive_url, - const char *package_status) + const char *pkg_status) { - char *url = malloc(strlen(archive_url)+ - strlen(QUERY_GET_PUBLISHED_BINARIES)+ - strlen("&status=")+ - 9+ - 1); + struct json_object *o_next; + char *url; json_object *o; - struct binary_package_publishing_history **result; + void **result = NULL; + + url = malloc(strlen(archive_url)+ + strlen(QUERY_GET_PUBLISHED_BINARIES)+ + (pkg_status ? strlen("&status=")+strlen(pkg_status) : 0)+ + 1); strcpy(url, archive_url); strcat(url, QUERY_GET_PUBLISHED_BINARIES); - - if (package_status) { + if (pkg_status) { strcat(url, "&status="); - strcat(url, package_status); + strcat(url, pkg_status); } - o = get_json_object(url); - free(url); + while (url) { + o = get_json_object(url); + free(url); + url = NULL; - if (!o) - return NULL; + if (!o) + break; - result = json_object_to_binary_package_publishing_history_list(o); + result = list_append_list(result, + (void **)json_object_to_bpph_list(o)); - json_object_put(o); + o_next = json_object_object_get(o, "next_collection_link"); - return result; + if (o_next) + url = strdup(json_object_get_string(o_next)); + + json_object_put(o); + } + + return (struct binary_package_publishing_history **)result; } int get_download_count(const char *archive_url) @@ -244,8 +292,7 @@ struct daily_download_total **get_daily_download_totals(const char *binary_url) void lp_ws_cleanup() { - if (debug) - printf("DEBUG: cleanup CURL\n"); + log_debug(_("cleanup CURL")); curl_easy_cleanup(curl); curl_global_cleanup();