koyo-postgres-replication 0.1.0.pre → 0.1.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78e654e0e390dedac52210540c5dafdb1c189b1bbb01968c8bd09b5bf5ee250f
-  data.tar.gz: 9dfdec20a290ae9d30ac91f7cfb404530053f883c9f12a57f678dd3665f4be8a
+  metadata.gz: 1cc8e3d452d94177ba7d15d098bbb38b949c45a4e25c22562b358f2858b8d541
+  data.tar.gz: f844b6eb897ab00c079be8e09a45398532657938ab9e2ae762ddd07c67f685be
 SHA512:
-  metadata.gz: 97987ad66fbed7a4c14124de1776e771c3e54fb1c70b8f7fca6f588fc054dd858af38b753d2578e65aaefc25e9c048d86af49d6d3f6822ccbdadc7a76d42fbb9
-  data.tar.gz: d3fd6f95478bbf33830f7f8c85fcc3b99d9599987fea81cdd639f997d625bfd8fdfc99e9b4881da9ee6f703665d2019f9824ffc5ce38474828918c457abf82c6
+  metadata.gz: b7e17ddc565bcc1badd81dd6520506578e9eaf09be4598ace88b1336b8c8d797ea01e48724bad5217faf2442bcd04b5cce23a48f5feb048adc00d055e7c912d7
+  data.tar.gz: df0fd55f7909c6c401fbef598e618cd4837b22634400931b9942c50b650cde64b275c61ecdb7b0f82ab5f620a0b82b3851d9c4e40c20e9ecf7303b9e3628282c

data/.rubocop.yml

@@ -17,6 +17,7 @@ Layout/LineLength:
   Max: 90
 
 AllCops:
+  TargetRubyVersion: 3.2.2
   DisplayCopNames: true
   Exclude:
     - 'spec/dummy/config/**/*'

data/.yardoc/checksums

@@ -4,11 +4,11 @@ lib/koyo/repl/mod.rb 92b54b56643b06fdc74adc65dc04460f631d4036
 lib/koyo/repl/data.rb cb847585c0f439b9f645b5ebd7fa3b96e08b94ff
 lib/koyo/repl/install.rb 9b19b7bb74d084882a1f726693bac2d693015daa
 lib/koyo/repl/railtie.rb acb36cbbe1b386ece7567990945adecb6b6e5b80
-lib/koyo/repl/version.rb 94239a7a9719294e13a38b878da1d328b44fb3f5
+lib/koyo/repl/version.rb 45af9c57eb86c840d6c0756f1cd0b8a2f4b00ac0
 lib/koyo/repl/data_row.rb 321caf0b080621f2d319fa152948cbe864c77294
 lib/koyo/repl/database.rb 39a304909ccf68d69d36c84e3036debd9f29f6ec
-lib/koyo/repl/diagnostics.rb 03b91c5ea3dbe1e337f4427d8f3261ebedb45a70
-lib/koyo/repl/configuration.rb 17858828602d696a584a9e3c239c0a5d94faa738
-lib/koyo/repl/postgres_server.rb 2569fa642e55f6032e6ea73e9ab8762018d3cd6c
+lib/koyo/repl/diagnostics.rb 93226c47642c5e20f615425aff8a0c0ba988b07b
+lib/koyo/repl/configuration.rb 8a32f819abf035340a3997d989ccafe0751d209e
+lib/koyo/repl/postgres_server.rb c8f557e1eec5b9be51ebd48002a3986eddbd6634
 lib/koyo_postgres_replication.rb e3f4d905e3045b59f1f7c799d84cd9fde70eebd8
 lib/koyo/repl/event_handler_service.rb 99b67bdcf3e0e92a04cd01bf8d05a4569b45d218

data/.yardopts

@@ -0,0 +1,7 @@
+--protected
+--no-private
+--embed-mixin ClassMethods
+-
+README.md
+CHANGELOG.md
+MIT-LICENSE

data/Gemfile

@@ -6,9 +6,9 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 # Specify your gem's dependencies in koyo_repl.gemspec
 gemspec
 
+gem 'pg', '~> 1.1'
 gem 'rails', '~> 7.0'
 gem 'rake', '~> 13.0'
-gem 'pg', '~> 1.1'
 
 group :development, :test do
   gem 'debug', platforms: %i[mri mingw x64_mingw]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    koyo-postgres-replication (0.1.0.pre)
+    koyo-postgres-replication (0.1.2.pre)
       pg (~> 1.1)
       rack (~> 2.0, >= 2.0.0)
       rails (~> 7.0)

data/README.md

@@ -1,5 +1,8 @@
 # Koyo::Postgres::Replication
 
+例 rei - Japanese for example 
+効用 koyo - Japanese for utility
+
 ## Replcation slots
 
 This gem tries to simplify dealing with a `replication slot` in Postgres. 
@@ -33,9 +36,7 @@ wiki](https://github.com/wiseleyb/koyo-postgres-replication/wiki/Configuring-Pos
 Add to Gemfile:
 
 ```
-gem 'koyo-postgres-replication', 
-    git: 'https://github.com/wiseleyb/koyo-postgres-replication',
-    require: 'koyo'
+gem 'koyo-postgres-replication', require: 'koyo'
 ```
 
 Then:
@@ -185,6 +186,16 @@ TODO: update
 * run rubocop
 * add/run yard
 
+# Working with gem
+
+## Gem Build
+
+```
+rm koyo-postgres-replication-{current version}.gem
+git add .
+gem build
+```
+
 # TODO
 
 * add monitoring helpers

data/changelog.md

@@ -1,5 +1,23 @@
 # Koyo Postgres Replication Changelog
 
+## 0.1.3.pre
+
+- republishing yanked gem
+
+## 0.1.2.pre
+
+- bump TargetRubyVersion for Rubocop to 3.2.2
+- fix [Issue
+  2](https://github.com/wiseleyb/koyo-postgres-replication/issues/2) - gemspec
+config around Yard doc
+- Enter retry loop instead of crashing when db connection goes away
+
+## 0.1.1.pre
+
+- remove deprecated has_rdoc from gem spec
+- fix [Issue 1](https://github.com/wiseleyb/koyo-postgres-replication/issues/1)
+  - remove recursive run, replace with simple loop
+
 ## 0.1.0.pre
 
 - rails 7 plugin

data/koyo-postgres-replication.gemspec

@@ -17,10 +17,13 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.7.0'
 
-  # spec.metadata["allowed_push_host"] = ''
-  spec.metadata['changelog_uri'] = "#{url}/changelog.md"
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = url
+  spec.metadata = {
+    'bug_tracker_uri' => "#{url}/issues",
+    'changelog_uri' => "#{url}/blob/main/changelog.md",
+    'documentation' => 'https://www.rubydoc.info/github/wiseleyb/koyo-postgres-replication/main',
+    'homepage_uri' => spec.homepage,
+    'source_code_uri' => burl
+  }
 
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|
@@ -38,6 +41,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec-rails', '~> 3.1'
   spec.add_development_dependency 'yard', '~> 0.9'
-
-  spec.has_rdoc = 'yard'
 end

data/lib/koyo/repl/configuration.rb

@@ -92,12 +92,12 @@ module Koyo
       # Helper method that converts config settings into a hash
       def to_h
         {
-          auto_create_replication_slot: auto_create_replication_slot,
-          config_prefix: config_prefix,
-          database_name: database_name,
-          slot: slot,
-          sql_delay: sql_delay,
-          test_mode: test_mode
+          auto_create_replication_slot:,
+          config_prefix:,
+          database_name:,
+          slot:,
+          sql_delay:,
+          test_mode:
         }
       end
 

data/lib/koyo/repl/database.rb

@@ -19,6 +19,7 @@ module Koyo
           conn_name = Koyo::Repl.config.database_name
 
           unless conn_name
+            ActiveRecord::Base.establish_connection
             @conn = ActiveRecord::Base.connection
             return @conn
           end
@@ -35,6 +36,14 @@ module Koyo
           @conn
         end
 
+        # Attempts to re-establish db connection
+        # This would be used when something happens like the postgres
+        # server restarts
+        def re_establish_conn
+          @conn = nil
+          conn
+        end
+
         # Reads from the replication slot.
         # Reading from this marks the rows read (so you won't see them again)
         # For testing you can use `peek_slot` if you want to - which will keep

data/lib/koyo/repl/diagnostics.rb

@@ -72,7 +72,7 @@ module Koyo
 
       # Returns configured database name
       def adapter_name
-        Koyo::Repl::Datasbase.conn.adapter_name
+        Koyo::Repl::Database.conn.adapter_name
       rescue StandardError => e
         "Error: #{e.message}"
       end

data/lib/koyo/repl/postgres_server.rb

@@ -45,38 +45,70 @@ module Koyo
       # Runs the server. You should only be running ONE of these
       # servers at a time.
       def run!
-        # This allows us to catch ctrl-c and exit
-        trap('SIGINT') { throw :done }
-
-        catch(:done) do
-          check
-          sleep Koyo::Repl.config.sql_delay
-          tick_tock
-          run!
-        # Possibly fatal errors
-        rescue ActiveRecord::StatementInvalid => e
-          if e.cause.exception.is_a?(PG::ConnectionBad)
+        loop do
+          begin
+            check
+            tick_tock
+          # Possibly fatal errors
+          rescue ActiveRecord::StatementInvalid => e
             Koyo::Repl::EventHandlerService.koyo_error(e)
-            msg = "SHUTTING DOWN. Fatal Error in ReplPostgresServer: #{e.message}"
-            log_repl_fatal(msg, err: e)
-          else
+            @retry = 0
+            break unless attempt_reconnect(e)
+          rescue StandardError => e
             log_recoverable_error(e)
-            run!
           end
-        rescue StandardError => e
-          log_recoverable_error(e)
-          run!
+
+          break unless sleep_success?
         end
       end
 
+      # Attempts to re-establish DB connection. If it finds any other
+      # error this is fatal and server crashes at this point
+      # @param [StandardError] err Error that kicked off this retry loop
+      def attempt_reconnect(err)
+        @retry ||= 0
+        msg = "Error: Attempting to reconnect to DB. Retry: #{@retry}."
+        log_recoverable_error(err)
+
+        return false unless sleep_success?
+
+        Koyo::Repl::Database.re_establish_conn
+        msg = 'Re-established DB connection'
+        log_repl_info(msg)
+        true
+      rescue StandardError => e
+        unless bad_connection_error?(e)
+          msg = 'Fatal: Found erorr unrelated to PG::ConnectionBad while '\
+                "trying to reconnect: Error: #{e.message}"
+          log_repl_fatal(msg, err: e)
+          return false
+        end
+
+        @retry += 1
+        retry
+      end
+
+      # Test error to see if it's db:connection related
+      # Mostly here for specs
+      # @param [StandardError] err Error to check
+      def bad_connection_error?(err)
+        err.cause.exception.is_a?(PG::ConnectionBad)
+      end
+
+      # Did sleep succeed... this fails when you do something like hit
+      # ctrl-c on the server
+      # Mostly here for specs
+      def sleep_success?
+        system("sleep #{Koyo::Repl.config.sql_delay}")
+      end
+
       # Handles erros that aren't fatal. Calls back to
       # Koyo::Repl::Log@log_repl_error which calls back
       # to KoyoReplHandlerServer@log_repl_error
       def log_recoverable_error(err)
         Koyo::Repl::EventHandlerService.koyo_error(err)
         msg = "Error in ReplPostgresServer: #{err.message}"
-        log_repl_error(msg, err: err)
-        sleep Koyo::Repl.config.sql_delay
+        log_repl_error(msg, err:)
       end
 
       # Basic heart beat ping to allow you to see the server is still

data/lib/koyo/repl/version.rb

@@ -2,6 +2,6 @@
 
 module Koyo
   module Repl
-    VERSION = '0.1.0.pre'
+    VERSION = '0.1.3.pre'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koyo-postgres-replication
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.3.pre
 platform: ruby
 authors:
 - Ben Wiseley
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-17 00:00:00.000000000 Z
+date: 2023-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -115,6 +115,7 @@ files:
 - ".yardoc/object_types"
 - ".yardoc/objects/root.dat"
 - ".yardoc/proxy_types"
+- ".yardopts"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -143,9 +144,11 @@ homepage: https://github.com/wiseleyb
 licenses:
 - MIT
 metadata:
-  changelog_uri: https://github.com/wiseleyb/koyo-postgres-replication/changelog.md
+  bug_tracker_uri: https://github.com/wiseleyb/koyo-postgres-replication/issues
+  changelog_uri: https://github.com/wiseleyb/koyo-postgres-replication/blob/main/changelog.md
+  documentation: https://www.rubydoc.info/github/wiseleyb/koyo-postgres-replication/main
   homepage_uri: https://github.com/wiseleyb
-  source_code_uri: https://github.com/wiseleyb/koyo-postgres-replication
+  source_code_uri: https://github.com/wiseleyb
 post_install_message:
 rdoc_options: []
 require_paths: