Reconnect to PostgreSQL on every job

The database handler might die out and start skipping all the rest of the jobs on a single database failure.
mediacloud · Aug 10, 2017 · 97c110d · 97c110d
1 parent 34971f5
commit 97c110d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/lib/MediaWords/Job/AnnotateWithCoreNLP.pm b/lib/MediaWords/Job/AnnotateWithCoreNLP.pm
@@ -31,20 +31,12 @@ use MediaWords::Util::CoreNLP;
 use MediaWords::DBI::Stories;
 use Readonly;
 
-# Having a global database object should be safe because
-# job workers don't fork()
-my $db = undef;
-
 # Run CoreNLP job
 sub run($;$)
 {
     my ( $self, $args ) = @_;
 
-    unless ( $db )
-    {
-        # Postpone connecting to the database so that compile test doesn't do that
-        $db = MediaWords::DB::connect_to_db();
-    }
+    my $db = MediaWords::DB::connect_to_db();
 
     my $stories_id = $args->{ stories_id } + 0;
     unless ( $stories_id )

diff --git a/lib/MediaWords/Job/Bitly/FetchStoryStats.pm b/lib/MediaWords/Job/Bitly/FetchStoryStats.pm
@@ -39,17 +39,12 @@ Readonly my $BITLY_RATE_LIMIT_SECONDS_TO_WAIT => 60 * 10;    # every 10 minutes
 # How many times to try on rate limiting errors
 Readonly my $BITLY_RATE_LIMIT_TRIES => 7;                    # try fetching 7 times in total (70 minutes)
 
-# Having a global database object should be safe because
-# job workers don't fork()
-my $db = undef;
-
 # Run job
 sub run($;$)
 {
     my ( $self, $args ) = @_;
 
-    # Postpone connecting to the database so that compile test doesn't do that
-    $db ||= MediaWords::DB::connect_to_db();
+    my $db = MediaWords::DB::connect_to_db();
 
     my $stories_id      = $args->{ stories_id } or die "'stories_id' is not set.";
     my $start_timestamp = $args->{ start_timestamp };

diff --git a/lib/MediaWords/Job/Facebook/FetchStoryStats.pm b/lib/MediaWords/Job/Facebook/FetchStoryStats.pm
@@ -32,10 +32,6 @@ use MediaWords::Util::Process;
 use Readonly;
 use Data::Dumper;
 
-# Having a global database object should be safe because
-# job workers don't fork()
-my $db = undef;
-
 # Run job
 sub run($;$)
 {
@@ -47,8 +43,7 @@ sub run($;$)
         fatal_error( 'Facebook API processing is not enabled.' );
     }
 
-    # Postpone connecting to the database so that compile test doesn't do that
-    $db ||= MediaWords::DB::connect_to_db();
+    my $db = MediaWords::DB::connect_to_db();
 
     my $stories_id = $args->{ stories_id } or die "'stories_id' is not set.";