Changeset 90fc864

Timestamp:

2011-11-24T08:18:04Z (13 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

693ff09, e4fc493

Parents:

c945ee3

Message:

Hopefully this fixed #838. Patch from Artem Savkov, thanks! The problem was
HTTP failures caused by (most likely) DNS resolution problems. Yes, ignoring
return values is still bad, kids!

Location:

protocols/twitter

Files:

• twitter.h (modified) (1 diff)
• twitter_lib.c (modified) (4 diffs)

protocols/twitter/twitter.h

@@ -39 +39 @@
         TWITTER_GOT_TIMELINE = 0x20000,
         TWITTER_GOT_MENTIONS = 0x40000,
-        TWITTER_DOING_TIMELINE_SLOW = 0x80000,
 } twitter_flags_t;
 

protocols/twitter/twitter_lib.c

@@ -727 +727 @@
         gboolean include_mentions = set_getbool(&ic->acc->set, "fetch_mentions");
 
-        if ((td->flags & 0xf0000) == (TWITTER_DOING_TIMELINE | TWITTER_DOING_TIMELINE_SLOW)) {
-                imcb_log(ic, "Connection seems to have stalled again.\n"
-                             "This is a known bug, if you see this happen a lot "
-                             "please generate some traffic dumps.");
-                td->flags &= ~0xf0000;
-        }
-
         if (td->flags & TWITTER_DOING_TIMELINE) {
-                /* This shouldn't normally happen at all but I'm currently hunting a bug
-                   where it does. Instead of having users suffer under it, have a work-
-                   around with a warning. */
-                td->flags |= TWITTER_DOING_TIMELINE_SLOW;
                 return;
         }
@@ -828 +817 @@
         }
 
-        twitter_http(ic, TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, args,
-                     td->timeline_id ? 6 : 4);
+        if (twitter_http(ic, TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, args,
+                     td->timeline_id ? 6 : 4) == NULL) {
+                if (++td->http_fails >= 5)
+                        imcb_error(ic, "Could not retrieve %s: %s",
+                                   TWITTER_HOME_TIMELINE_URL, "connection failed");
+                td->flags |= TWITTER_GOT_TIMELINE;
+                twitter_flush_timeline(ic);
+        }
 
         g_free(args[1]);
@@ -857 +852 @@
         }
 
-        twitter_http(ic, TWITTER_MENTIONS_URL, twitter_http_get_mentions, ic, 0, args,
-                     td->timeline_id ? 6 : 4);
+        if (twitter_http(ic, TWITTER_MENTIONS_URL, twitter_http_get_mentions, ic, 0, args,
+                     td->timeline_id ? 6 : 4) == NULL) {
+                if (++td->http_fails >= 5)
+                        imcb_error(ic, "Could not retrieve %s: %s",
+                                   TWITTER_MENTIONS_URL, "connection failed");
+                td->flags |= TWITTER_GOT_MENTIONS;
+                twitter_flush_timeline(ic);
+        }
 
         g_free(args[1]);
@@ -946 +947 @@
                 // It didn't go well, output the error and return.
                 if (++td->http_fails >= 5)
-                        imcb_error(ic, "Could not retrieve " TWITTER_MENTIONS_URL ": %s",
-                                   twitter_parse_error(req));
+                        imcb_error(ic, "Could not retrieve %s: %s",
+                                   TWITTER_MENTIONS_URL, twitter_parse_error(req));
 
                 goto end;