factory_bro 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dcb2bfceacd76d523581ef27f60a5288191ec73
-  data.tar.gz: ac758cfe634c7478b6db82d37f405be735df0628
+  metadata.gz: e12f25e427e7087744e62c7612dc01feb1d40443
+  data.tar.gz: e6dff640ac5da0dbfe21274a42824c8158d90410
 SHA512:
-  metadata.gz: ab87b643dfbf083536445ea15e9a8de3063c725803d6df93fd00c6b67fb5305759effd7faef9debdfbabdf2672bda96772137564213d17fc0f9c9881bb3d861c
-  data.tar.gz: b6cdd259fb39f94fd73be16fc4d46b20f5f21ee6445c473646e44154a7651a19355ce387de503aa3d82c35b83f7296461c4e4e23891c8b2d751ddacd246628ff
+  metadata.gz: 7ef31083d40b63338dac93c6584ad887251e3bd3c4eef6d90078de493bc5354cc5615dcf7c94db90e35c74ed6048f6b2d8404b4c458ce4df7dbd561f4e22b310
+  data.tar.gz: fa4374be89e8ba9e20650b039ec58ea6dffca7e3e87625d5212e149e93351bfe48f0b341896d63a1d55ae243a781b17f50319c7b534b9437538dd3d2cd93b5c6

data/lib/factory_bro.rb

@@ -8,28 +8,36 @@ class FactoryBro
       $conns = {}
     else
       $conns.each do |key, conn|
-        if conn.finished?
+        if conn&.finished?
           $conns[key] = ''
         end
       end
     end
+    unless $dbs
+      $dbs = {}
+    end
+    $dbs[name] = db
     if db.include? 'postgres://'
       dbData = parse_url(db)
-      $conns[name] = PG.connect( user:     dbData[:user],
-                          password: dbData[:pw],
-                          host:     dbData[:host],
-                          port:     dbData[:port],
-                          dbname:   dbData[:dbname]
-                        )
+      $conns[name] = safe_connect(name) do
+        PG.connect(
+          user:     dbData[:user],
+          password: dbData[:pw],
+          host:     dbData[:host],
+          port:     dbData[:port],
+          dbname:   dbData[:dbname]
+        )
+      end
     else
       # take arguments of user and pw
-      $conns[name] = PG.connect( dbname: db)
+      $conns[name] = safe_connect { PG.connect(dbname: db) }
     end
   end
 
   def self.close(name)
     $conns[name].finish
     $conns[name] = ''
+    $dbs[name] = ''
   end
 
   def self.close_all
@@ -39,10 +47,12 @@ class FactoryBro
       end
     end
     $conns = nil
+    $dbs = nil
   end
 
   def self.exec(name, statement)
-    run = $conns[name].exec(statement)
+    run = safe_connect(name) { $conns[name].exec(statement) }
+    $try = 0
     run.values
   end
 
@@ -154,4 +164,26 @@ end
     end
     { columns: columns, values: values}
   end
+
+  def self.safe_connect(name)
+    $try ||= 0
+    max_tries = 4
+    wait = 10
+    success = false
+    result = nil
+    until success
+      begin
+        result = yield
+        success = true
+        result
+      rescue PG::UnableToSend, PG::ConnectionBad => error
+        $try += 1
+        raise error if $try > max_tries
+        puts "FactoryBro error: Failed to connect to #{name}, try ##{$try} to reconnect in #{wait}s"
+        sleep wait
+        connect(name, $dbs[name])
+      end
+    end
+    result
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: factory_bro
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Nate Reynolds
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -60,7 +60,8 @@ extra_rdoc_files: []
 files:
 - lib/factory_bro.rb
 homepage: https://github.com/nvreynolds/factory_bro
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []