Increase retry timeout to 1 minute.

libcurl_http_fetcher.cc

 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "update_engine/libcurl_http_fetcher.h"
 #include <algorithm>
 #include "base/logging.h"
 
 using std::max;
 using std::make_pair;
@@ skipping 94 matching lines @@
     if ((transfer_size_ >= 0) && (bytes_downloaded_ < transfer_size_)) {
       // Need to restart transfer
       retry_count_++;
       LOG(INFO) << "Restarting transfer b/c we finished, had downloaded "
                 << bytes_downloaded_ << " bytes, but transfer_size_ is "
                 << transfer_size_ << ". retry_count: " << retry_count_;
       if (retry_count_ > kMaxRetriesCount) {
         if (delegate_)
           delegate_->TransferComplete(this, false);  // success
       } else {
-        g_timeout_add_seconds(5,
+        g_timeout_add_seconds(retry_seconds_,
                               &LibcurlHttpFetcher::StaticRetryTimeoutCallback,
                               this);
       }
       return;
     } else {
       if (delegate_) {
         // success is when http_response_code is 2xx
         bool success = (http_response_code >= 200) &&
             (http_response_code < 300);
         delegate_->TransferComplete(this, success);
@@ skipping 83 matching lines @@
         &StaticFDCallback,
         this);
     io_channels_[i] = make_pair(io_channel, tag);
     static int io_counter = 0;
     io_counter++;
     if (io_counter % 50 == 0) {
       LOG(INFO) << "io_counter = " << io_counter;
     }
   }
 
-  // Wet up a timeout callback for libcurl
-  long ms = 0;
-  CHECK_EQ(curl_multi_timeout(curl_multi_handle_, &ms), CURLM_OK);
-  if (ms < 0) {
-    // From http://curl.haxx.se/libcurl/c/curl_multi_timeout.html:
-    //     if libcurl returns a -1 timeout here, it just means that libcurl
-    //     currently has no stored timeout value. You must not wait too long
-    //     (more than a few seconds perhaps) before you call
-    //     curl_multi_perform() again.
-    ms = idle_ms_;
-  }
+  // Set up a timeout callback for libcurl.
   if (!timeout_source_) {
-    LOG(INFO) << "setting up timeout source:" << ms;
-    timeout_source_ = g_timeout_source_new_seconds(1);
-    CHECK(timeout_source_);
-    g_source_set_callback(timeout_source_, StaticTimeoutCallback, this,
-                          NULL);
+    LOG(INFO) << "Setting up timeout source: " << idle_seconds_ << " seconds.";
+    timeout_source_ = g_timeout_source_new_seconds(idle_seconds_);
+    g_source_set_callback(timeout_source_, StaticTimeoutCallback, this, NULL);
     g_source_attach(timeout_source_, NULL);
-    static int counter = 0;
-    counter++;
-    if (counter % 50 == 0) {
-      LOG(INFO) << "counter = " << counter;
-    }
   }
 }
 
 bool LibcurlHttpFetcher::FDCallback(GIOChannel *source,
                                     GIOCondition condition) {
   CurlPerformOnce();
   // We handle removing of this source elsewhere, so we always return true.
   // The docs say, "the function should return FALSE if the event source
   // should be removed."
   // http://www.gtk.org/api/2.6/glib/glib-IO-Channels.html#GIOFunc
@@ skipping 38 matching lines @@
     curl_handle_ = NULL;
   }
   if (curl_multi_handle_) {
     CHECK_EQ(curl_multi_cleanup(curl_multi_handle_), CURLM_OK);
     curl_multi_handle_ = NULL;
   }
   transfer_in_progress_ = false;
 }
 
 }  // namespace chromeos_update_engine