use file cache for distros

[ppastats.git] / src / lp_ws.c

diff --git a/src/lp_ws.c b/src/lp_ws.c
index 4549d92..023ba9b 100644 (file)
--- a/src/lp_ws.c
+++ b/src/lp_ws.c
@@ -28,18 +28,20 @@
 #include <json/json.h>
 
 #include "cache.h"
+#include "fcache.h"
 #include "list.h"
 #include "log.h"
 #include "lp_ws.h"
 #include "lp_json.h"
 #include "ppastats.h"
 
-static const char *QUERY_GET_PUBLISHED_BINARIES = "?ws.op=getPublishedBinaries";
+static const char *
+QUERY_GET_PUBLISHED_BINARIES = "?ws.op=getPublishedBinaries&ws.size=300";
 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 const int DEFAULT_FETCH_RETRIES = 10;
 
 static CURL *curl;
 
@@ -62,15 +64,8 @@ static size_t cbk_curl(void *buffer, size_t size, size_t nmemb, void *userp)
        return realsize;
 }
 
-static char *fetch_url(const char *url)
+static void init()
 {
-       struct ucontent *content = malloc(sizeof(struct ucontent));
-       char *result;
-       long code;
-       int retries;
-
-       log_debug(_("fetch_url(): %s"), url);
-
        if (!curl) {
                log_debug(_("initializing CURL"));
                curl_global_init(CURL_GLOBAL_ALL);
@@ -79,6 +74,19 @@ static char *fetch_url(const char *url)
 
        if (!curl)
                exit(EXIT_FAILURE);
+}
+
+static char *fetch_url(const char *url)
+{
+       struct ucontent *content = malloc(sizeof(struct ucontent));
+       char *result;
+       long code;
+       int retries;
+       unsigned int s;
+
+       log_debug(_("fetch_url(): %s"), url);
+
+       init();
 
        result = NULL;
 
@@ -106,21 +114,25 @@ static char *fetch_url(const char *url)
                case 502:
                case 503:
                case 504:
-                       if (retries) {
-                               log_err(_("Fetch failed with code %ld "
-                                         "for URL %s"),
-                                       code,
-                                       url);
+                       log_err(_("Fetch failed with code %ld for URL %s"),
+                               code,
+                               url);
 
-                               log_debug(_("Wait 5s before retry"));
-                               sleep(5);
+                       if (retries) {
+                               s = 2 * (DEFAULT_FETCH_RETRIES - retries) + 2;
+                               log_debug(_("Wait %ds before retry"), s);
+                               sleep(s);
 
                                free(content->data);
                                retries--;
                                goto retrieve;
                        }
+
+                       break;
                default:
-                       log_err(_("Fetch failed: %ld"), code);
+                       log_err(_("Fetch failed with code %ld for URL %s"),
+                               code,
+                               url);
                }
        }
 
@@ -224,12 +236,24 @@ const struct distro_arch_series *get_distro_arch_series(const char *url)
 {
        json_object *obj;
        const struct distro_arch_series *distro;
+       char *content;
 
        distro = cache_get(url);
        if (distro)
                return (struct distro_arch_series *)distro;
 
-       obj = get_json_object(url);
+       content = fcache_get(url + 7);
+       if (!content) {
+               content = fetch_url(url);
+               if (content)
+                       fcache_put(url + 7, content);
+               else
+                       return NULL;
+       }
+
+       obj = json_tokener_parse(content);
+
+       free(content);
 
        if (!obj)
                return NULL;