Changeset fa4c773

Timestamp:

Oct 16, 2017, 1:32:29 PM (7 years ago)

Author:

Adam Glasgall <glasgall@mit.edu>

Children:

5afbccf

Parents:

cb463cd

git-author:

Adam Glasgall <glasgall@mit.edu> (06/11/14 10:24:09)

git-committer:

Adam Glasgall <glasgall@mit.edu> (10/16/17 13:32:29)

Message:

fix retries in Zulip module

File:

• perl/modules/Zulip/lib/BarnOwl/Module/Zulip.pm (modified) (5 diffs)

perl/modules/Zulip/lib/BarnOwl/Module/Zulip.pm

@@ -8 +8 @@
 our $last_event_id;
 our %cfg;
-our $max_retries = 5;
+our $max_retries = 1000;
+our $retry_timer;
 
 use AnyEvent;
@@ -115 +116 @@
 }
 
+sub parse_response {
+    my ($body, $headers) = @_;
+    if($headers->{Status} > 399) {
+        return 0;
+    }
+    my $response = decode_json($body);
+    if($response->{result} ne "success") {
+        return 0;
+    }
+    return $response;
+}
 sub do_poll {
     my $uri = URI->new($cfg{'api_url'} . "/events");
@@ -123 +135 @@
     $callback = sub {
         my ($body, $headers) = @_;
-        if($headers->{Status} > 399) {
-            warn "Failed to poll for events: $headers->{Reason}";
-            BarnOwl::debug($body);
+        my $response = parse_response($body, $headers);
+        if(!$response) {
+            warn "Failed to poll for events in do_poll: $headers->{Reason}";
             if($retry_count >= $max_retries) {
+                warn "Retry count exceeded in do_poll, giving up";
                 fail("do_poll: Giving up");
             } else {
+                warn "Retrying";
                 $retry_count++;       
-                http_get($uri->as_string, 
-                                   "headers" => { "Authorization" => authorization }, 
-                                   $callback);
+                $retry_timer = AnyEvent->timer(after => 10, cb => sub { warn "retry number $retry_count"; 
+                                                         http_get($uri->as_string, 
+                                                                  "headers" => { "Authorization" => authorization }, 
+                                                                  $callback);
+                                                         return;
+                                });
                 return;
             }
         } else {
-            event_cb($body, $headers);
+            event_cb($response);
         }
     };
@@ -144 +161 @@
 
 sub event_cb {
-    my ($body, $headers) = @_;
-    my $response = decode_json($body);
+    my $response = $_[0];
     if($response->{result} ne "success") {
-        fail("Failed to poll for events; error was $response->{msg}");
+        fail("event_cb: Failed to poll for events; error was $response->{msg}");
     } else {
         for my $event (@{$response->{events}}) {
@@ -165 +181 @@
                     zid => $msg->{id},
                     sender_full_name => $msg->{sender_full_name});
+                $msghash{'body'} =~ s/\r//gm;
                 if($msg->{type} eq "private") {
                     $msghash{private} = 1;