X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flp_ws.c;h=5eca19ab4c47ef30be8dd6dd4536a64ba2514892;hb=533275304146eb804504e5885ce003f9f066fc20;hp=2370d36664035f2c8628e5b80da1b41ff8255ab1;hpb=9412dc53bab346c119e4d1502e65cd7c68487d30;p=ppastats.git

diff --git a/src/lp_ws.c b/src/lp_ws.c
index 2370d36..5eca19a 100644
--- a/src/lp_ws.c
+++ b/src/lp_ws.c
@@ -19,6 +19,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <curl/curl.h>
 #include <json/json.h>
@@ -29,11 +30,12 @@
 #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;
 
@@ -59,13 +61,16 @@ 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);
 
 	if (!curl) {
+		if (debug)
+			printf("DEBUG: initializing CURL\n");
 		curl_global_init(CURL_GLOBAL_ALL);
 		curl = curl_easy_init();
 	}
@@ -73,6 +78,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;
@@ -84,10 +94,34 @@ 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) {
+				fprintf(stderr,
+					"Fetch failed: with code %ld "
+					"for URL= %s\n",
+					code,
+					url);
+
+				if (debug)
+					printf("Wait 5s before retry.\n");
+				sleep(5);
+
+				free(content->data);
+				retries--;
+				goto retrieve;
+			}
+		default:
+			fprintf(stderr, "Fetch failed: %ld\n", code);
+		}
 	}
 
 	if (!result)
@@ -116,50 +150,29 @@ static json_object *get_json_object(const char *url)
 	return NULL;
 }
 
-static void **list_add_list(void **list1, void **list2)
-{
-	int n1, n2, n;
-	void **list;
-
-	n1 = list_length(list1);
-	n2 = list_length(list2);
-
-	n = n1 + n2 + 1;
-
-	list = malloc(sizeof(void *)*(n+1));
-
-	memcpy(list, list1, n1*sizeof(void *));
-	memcpy(list+n1, list2, n2*sizeof(void *));
-
-	list[n1+n2] = NULL;
-
-	free(list1);
-
-	return list;
-}
-
 #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)
 {
 	struct json_object *o_next;
-	char *url = malloc(strlen(archive_url)+
-			   strlen(QUERY_GET_PUBLISHED_BINARIES)+
-			   strlen("&status=")+
-			   9+
-			   1);
+	char *url;
 	json_object *o;
 	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);
 	}
 
 	while (url) {
@@ -170,8 +183,8 @@ get_binary_package_publishing_history_list(const char *archive_url,
 		if (!o)
 			break;
 
-		result = list_add_list(result,
-				       (void **)json_object_to_bpph_list(o));
+		result = list_append_list(result,
+					  (void **)json_object_to_bpph_list(o));
 
 		o_next = json_object_object_get(o, "next_collection_link");