hotswap 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb39bbe01190402e38969b9721794ab4845fd46907a4bfd8d5e21f3cd2cc30dc
-  data.tar.gz: c948687920739f879999caf87ab23d8baacefbeb8bcd8a008e37976dc0016d39
+  metadata.gz: e2313b39ed36d4fd0d236192de9c34f9ac7546984f8a076d474f035abddef947
+  data.tar.gz: a7458d108f6d2051a08c89aa3a8357c3cb72ccb892c7669b69d3deeaf1f5abe3
 SHA512:
-  metadata.gz: f549bb47a1e79ee364b68cb8e96160f877190d41f8bdf785ea16659d1f7b5aad3bacd052085c588b9b089906d152bc0428098729d5a44b61c7e1cec866680b29
-  data.tar.gz: daaaf30d063d08ced91ff9249f625a6424d50247e1748f2b75506ce21bf6279fce63a9001adf72649397bcd3d45d375aafa498d4f94d45e2449d05797daba2b7
+  metadata.gz: 53ea80ca58d9f342fc04bc51385674ee5b5f8d3dd64a63a18869b5d4fdc81f8ac74c80a6901991d8709d65aeb565d19a5ca3cbeaa19e1a0408ab4ca9ce0dd154
+  data.tar.gz: dfbb24c4a439443db7e43d19f65b9964c86505eda6479fa6ec4ca75cba93b25cc619a6d845aa6ca16a822bc187c2f53f8cabdbf66d4ffae98dc9e93682324fbb

data/lib/hotswap/database.rb

@@ -12,6 +12,9 @@ module Hotswap
 
     # Push a new database from an IO stream or file path
     def push(source, stdout: $stdout, stderr: $stderr)
+      source_label = source.is_a?(String) ? source : "stdin"
+      logger.info "push started: #{source_label} → #{@path}"
+
       input = source.is_a?(String) ? File.open(source, "rb") : source
 
       dir = File.dirname(@path)
@@ -19,31 +22,39 @@ module Hotswap
       begin
         IO.copy_stream(input, temp)
         temp.close
+        logger.info "received #{File.size(temp.path)} bytes, running integrity check"
 
         db = SQLite3::Database.new(temp.path)
         result = db.execute("PRAGMA integrity_check")
         db.close
         unless result == [["ok"]]
+          logger.error "integrity check failed for #{source_label}"
           stderr.write("ERROR: integrity check failed\n")
           return false
         end
 
+        logger.info "integrity check passed, acquiring swap lock"
         stderr.write("Swapping database...\n")
 
         Middleware::SWAP_LOCK.synchronize do
           if defined?(ActiveRecord::Base)
             ActiveRecord::Base.connection_handler.clear_all_connections!
+            logger.info "disconnected ActiveRecord"
           end
           File.rename(temp.path, @path)
+          logger.info "renamed #{temp.path} → #{@path}"
         end
 
         if defined?(ActiveRecord::Base)
           ActiveRecord::Base.establish_connection
+          logger.info "reconnected ActiveRecord"
         end
 
+        logger.info "push complete: #{@path}"
         stdout.write("OK\n")
         true
       rescue => e
+        logger.error "push failed: #{e.message}"
         stderr.write("ERROR: #{e.message}\n")
         false
       ensure
@@ -54,7 +65,11 @@ module Hotswap
 
     # Pull the database to an IO stream or file path
     def pull(destination, stderr: $stderr)
+      dest_label = destination.is_a?(String) ? destination : "stdout"
+      logger.info "pull started: #{@path} → #{dest_label}"
+
       unless File.exist?(@path)
+        logger.error "database file not found at #{@path}"
         stderr.write("ERROR: database file not found at #{@path}\n")
         return false
       end
@@ -69,20 +84,28 @@ module Hotswap
         b.finish
         dst_db.close
         src_db.close
+        logger.info "backup complete: #{File.size(temp.path)} bytes"
 
         if destination.is_a?(String)
           FileUtils.cp(temp.path, destination)
+          logger.info "pull complete: #{@path} → #{destination}"
           stderr.write("OK\n")
         else
           File.open(temp.path, "rb") { |f| IO.copy_stream(f, destination) }
+          logger.info "pull complete: #{@path} → stdout"
         end
         true
       rescue => e
+        logger.error "pull failed: #{e.message}"
         stderr.write("ERROR: #{e.message}\n")
         false
       ensure
         temp.unlink if temp && File.exist?(temp.path)
       end
     end
+
+    private
+
+    def logger = Hotswap.logger
   end
 end

data/lib/hotswap/railtie.rb

@@ -2,6 +2,10 @@ module Hotswap
   class Railtie < Rails::Railtie
     config.hotswap = ActiveSupport::OrderedOptions.new
 
+    initializer "hotswap.logger" do
+      Hotswap.logger = Rails.logger
+    end
+
     initializer "hotswap.configure" do |app|
       # Discover all SQLite databases from Rails config
       if app.config.hotswap.database_paths

data/lib/hotswap/socket_server.rb

@@ -27,10 +27,15 @@ module Hotswap
 
       @thread = Thread.new { accept_loop }
       @thread.report_on_exception = false
+
+      logger.info "listening on #{@socket_path}"
+      logger.info "stderr socket on #{@stderr_socket_path}"
+      logger.info "managing #{Hotswap.databases.size} database(s): #{Hotswap.databases.map(&:path).join(', ')}"
       self
     end
 
     def stop
+      logger.info "shutting down"
       @server&.close
       @stderr_server&.close
       @thread&.kill
@@ -45,6 +50,8 @@ module Hotswap
 
     private
 
+    def logger = Hotswap.logger
+
     def accept_loop
       ios = [@server, @stderr_server]
       loop do
@@ -75,6 +82,7 @@ module Hotswap
 
     def handle_connection(socket)
       unless IO.select([socket], nil, nil, CONNECTION_TIMEOUT)
+        logger.warn "connection timed out"
         socket.write("ERROR: connection timeout\n") rescue nil
         return
       end
@@ -83,6 +91,7 @@ module Hotswap
       return unless line
 
       parts = Shellwords.split(line.strip)
+      logger.info "command: #{parts.join(' ')}" unless parts.empty?
 
       # Grab the stderr socket if one is waiting
       stderr_io = take_stderr_client
@@ -94,6 +103,7 @@ module Hotswap
         stderr: stderr_io || $stderr
       )
     rescue => e
+      logger.error "connection error: #{e.message}"
       socket.write("ERROR: #{e.message}\n") rescue nil
     ensure
       stderr_io&.close rescue nil

data/lib/hotswap/version.rb

@@ -1,3 +1,3 @@
 module Hotswap
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/hotswap.rb

@@ -1,3 +1,4 @@
+require "logger"
 require_relative "hotswap/version"
 require_relative "hotswap/middleware"
 require_relative "hotswap/database"
@@ -10,6 +11,11 @@ module Hotswap
 
   class << self
     attr_accessor :socket_path, :stderr_socket_path
+    attr_writer :logger
+
+    def logger
+      @logger ||= Logger.new($stdout, progname: "hotswap")
+    end
 
     def configure
       yield self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hotswap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Brad Gessler