added module to handle log

[ppastats.git] / src / lp_ws.c

diff --git a/src/lp_ws.c b/src/lp_ws.c
index b6957eb..81b8b63 100644 (file)
--- a/src/lp_ws.c
+++ b/src/lp_ws.c
@@ -16,6 +16,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
     02110-1301 USA
 */
+#include <libintl.h>
+#define _(String) gettext(String)
 
 #include <stdlib.h>
 #include <string.h>
@@ -26,17 +28,17 @@
 
 #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 int DEFAULT_FETCH_RETRIES = 3;
+static const int DEFAULT_FETCH_RETRIES = 3;
 
 static CURL *curl;
 
@@ -66,12 +68,10 @@ static char *fetch_url(const char *url)
        long code;
        int retries;
 
-       if (debug)
-               printf("DEBUG: fetch_url %s\n", url);
+       log_debug(_("fetch_url(): %s"), url);
 
        if (!curl) {
-               if (debug)
-                       printf("DEBUG: initializing CURL\n");
+               log_debug(_("initializing CURL"));
                curl_global_init(CURL_GLOBAL_ALL);
                curl = curl_easy_init();
        }
@@ -106,10 +106,12 @@ static char *fetch_url(const char *url)
                case 503:
                case 504:
                        if (retries) {
-                               fprintf(stderr, "Fetch failed: %ld\n", code);
+                               log_err(_("Fetch failed with code %ld "
+                                         "for URL %s"),
+                                       code,
+                                       url);
 
-                               if (debug)
-                                       printf("Wait 5s before retry.\n");
+                               log_debug(_("Wait 5s before retry"));
                                sleep(5);
 
                                free(content->data);
@@ -117,7 +119,7 @@ static char *fetch_url(const char *url)
                                goto retrieve;
                        }
                default:
-                       fprintf(stderr, "Fetch failed: %ld\n", code);
+                       log_err(_("Fetch failed: %ld"), code);
                }
        }
 
@@ -289,8 +291,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();