Add additional logging to help diagnose issues when downloading catalogs

fixes brave/brave-browser#4160
brave · Apr 18, 2019 · 2180dab · 2180dab
1 parent 6523053
commit 2180dab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/vendor/bat-native-ads/README.md b/vendor/bat-native-ads/README.md
@@ -302,7 +302,7 @@ Use staging Ads Serve as defined by `STAGING_SERVER` in `static_values.h`. Defau
 --brave-ads-staging
 ```
 
-Collect initial activity after 25 seconds instead of 1 hour as defined by `kDebugOneHourInSeconds` in `static_values.h`
+Collect initial activity after 25 seconds instead of 1 hour as defined by `kDebugOneHourInSeconds` in `static_values.h` and download the catalog after 15 minutes instead of 2 hours as defined by `kDebugCatalogPing` in `static_values.h`
 
 ```
 --brave-ads-debug

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ads_impl.cc b/vendor/bat-native-ads/src/bat/ads/internal/ads_impl.cc
@@ -327,6 +327,7 @@ void AdsImpl::SetConfirmationsIsReady(const bool is_ready) {
 
 void AdsImpl::ChangeLocale(const std::string& locale) {
   if (!IsInitialized()) {
+    BLOG(WARNING) << "Failed to change locale as not initialized";
     return;
   }
 
@@ -466,6 +467,7 @@ void AdsImpl::CachePageScore(
 
 void AdsImpl::TestShoppingData(const std::string& url) {
   if (!IsInitialized()) {
+    BLOG(WARNING) << "Failed to test shopping data as not initialized";
     return;
   }
 
@@ -478,6 +480,7 @@ void AdsImpl::TestShoppingData(const std::string& url) {
 
 bool AdsImpl::TestSearchState(const std::string& url) {
   if (!IsInitialized()) {
+    BLOG(WARNING) << "Failed to test search state as not initialized";
     return false;
   }
 
@@ -493,6 +496,7 @@ bool AdsImpl::TestSearchState(const std::string& url) {
 
 void AdsImpl::ServeSampleAd() {
   if (!IsInitialized()) {
+    BLOG(WARNING) << "Failed to serve sample Ad as not initialized";
     return;
   }
 
@@ -867,6 +871,7 @@ void AdsImpl::StartCollectingActivity(const uint64_t start_timer_in) {
 
 void AdsImpl::CollectActivity() {
   if (!IsInitialized()) {
+    BLOG(WARNING) << "Failed to collect activity as not initialized";
     return;
   }
 

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/ads_serve.cc b/vendor/bat-native-ads/src/bat/ads/internal/ads_serve.cc
@@ -118,7 +118,12 @@ void AdsServe::Reset() {
 void AdsServe::UpdateNextCatalogCheck() {
   next_retry_start_timer_in_ = 0;
 
-  auto ping = bundle_->GetCatalogPing();
+  uint64_t ping;
+  if (_is_debug) {
+    ping = kDebugCatalogPing;
+  } else {
+    ping = bundle_->GetCatalogPing();
+  }
 
   // Add randomized delay so that the Ad server can't correlate users by timing
   auto rand_delay = base::RandInt(0, ping / 10);

diff --git a/vendor/bat-native-ads/src/bat/ads/internal/static_values.h b/vendor/bat-native-ads/src/bat/ads/internal/static_values.h
@@ -35,6 +35,7 @@ static const uint64_t kDeliverNotificationsAfterSeconds =
     5 * base::Time::kSecondsPerMinute;
 
 static const uint64_t kDefaultCatalogPing = 2 * base::Time::kSecondsPerHour;
+static const uint64_t kDebugCatalogPing = 15 * base::Time::kSecondsPerMinute;
 
 static char kDefaultLanguageCode[] = "en";
 static char kDefaultCountryCode[] = "US";