svelte-on-rails 22.4.2 → 22.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58df2a12a11fd0781c7e00d95418b4313d18effd284f913ed9d8d2ac79191adf
-  data.tar.gz: eb08daf8b9bf7f60531fd3090890462a873c1f14a688a15e766f714ff36e38a5
+  metadata.gz: 9cb9864da582328d603e647cacb755402d42a08241ac60adaf73519d8627f10d
+  data.tar.gz: b223d557c6a5eb030710926a55b5f9ee5446c2641748b6aca30f9d76f2ebaf5b
 SHA512:
-  metadata.gz: 93853048bfc3ffdd8d874f94d012e555e9247f0bcf42db4850d1bfe2a9e450dc278f4ee4b85fef5ab721c61794e02f30e8041dd2a067bb4a2337c0966a100784
-  data.tar.gz: 4d504b58c5f9a32726ab1047dd8c1d14b37548c33642d13e5f37d2626bc9da7a3ee5e7cf85f004eca4aec8363f2de34e086fbc13773edc12afc1ce63f23680b7
+  metadata.gz: 95bea92ab87a3c73cbe9cc51637dbc3506110c5af1074fde97b3a794314fdae3b39b76748d973a7d4587294dde211027bdf1ef8955be528424f9818110431c3f
+  data.tar.gz: 6d21e528178d757eb73184d7f2b00a51123581645503fd5c6636f9e2297d3a3cc8a7364f656d062d36f73387ff045c51d1cabae9adb0154e6a39d30c30a5b0e7

data/lib/svelte_on_rails/lib/utils.rb

@@ -171,11 +171,12 @@ module SvelteOnRails
           Rails.root.join("log", "svelte-ssr-server.log")
       end
 
-      def self.ssr_server_log(msg)
+      def self.ssr_server_log(msg, ssr_logfile_only: false)
         File.open(ssr_server_logfile, 'a') do |f|
           f.sync = true
           f.puts("[#{Time.now.utc.iso8601(3)} ppid:#{Process.ppid} pid:#{Process.pid}] #{msg}")
         end
+        return if ssr_logfile_only
         puts "[SOR] #{msg}"
         $stdout.flush
       end

data/lib/svelte_on_rails/ssr_client.rb

@@ -167,11 +167,16 @@ module SvelteOnRails
       restart_after_failure: false
     )
 
-      SvelteOnRails::Lib::Utils.ssr_server_log("SOR start_node_server! called") if restart_after_failure
+      SvelteOnRails::Lib::Utils.ssr_server_log("SOR start_node_server! called", ssr_logfile_only: !restart_after_failure)
 
       # notice ppid
-      FileUtils.mkdir_p(@helpers.ssr_server_ppid_file.dirname)
-      File.write(@helpers.ssr_server_ppid_file, Process.ppid.to_s)
+      FileUtils.mkdir_p(@helpers.ssr_client_ppid_file.dirname)
+      File.write(@helpers.ssr_client_ppid_file, Process.ppid.to_s)
+      if @helpers.ssr_client_ppid_file.exist?
+        SvelteOnRails::Lib::Utils.ssr_server_log("File #{@helpers.ssr_client_ppid_file} written, PPID: #{Process.ppid}", ssr_logfile_only: true)
+      else
+        SvelteOnRails::Lib::Utils.ssr_server_log("ERROR: File #{@helpers.ssr_client_ppid_file} could not be written")
+      end
 
       start = Time.now
 
@@ -343,7 +348,7 @@ module SvelteOnRails
 
     end
 
-    def ssr_server_ppid_file
+    def ssr_client_ppid_file
       Rails.root.join("tmp", "pids", 'svelte_on_rails.ppid')
     end
 
@@ -396,7 +401,7 @@ module SvelteOnRails
     def shutdown(current_ppid: Process.ppid)
       terminate_processes(own_processes(current_ppid: current_ppid), label: "own")
     ensure
-      File.delete(ssr_server_ppid_file) if File.exist?(ssr_server_ppid_file)
+      File.delete(ssr_client_ppid_file) if File.exist?(ssr_client_ppid_file)
     end
 
     private
@@ -408,6 +413,7 @@ module SvelteOnRails
 
       processes.group_by(&:socket_path).values.flat_map { |g| g.sort_by(&:pid) }.each do |p|
         Process.kill("SIGINT", p.pid) rescue Errno::ESRCH || Errno::EPERM
+        SvelteOnRails::Lib::Utils.ssr_server_log("  Killed #{label} unix-pid: #{p.pid}, rails-ppid: #{p.ppid}, socket-path: #{p.socket_path}", ssr_logfile_only: true)
       end
 
       SvelteOnRails::Lib::Utils.ssr_server_log("Killed #{processes.length} #{label} process#{'es' if processes.length != 1}")

data/lib/tasks/svelte_on_rails_tasks.rake

@@ -16,7 +16,7 @@ namespace :svelte_on_rails do
 
     unless File.socket?(socket_path)
       puts "*" * 80
-      puts "ERROR: socket_path does not exist or is not a socket: #{socket_path}"
+      puts "ERROR: socket file does not exist or is not a socket: #{socket_path}"
       puts "Do you have set RAILS_ENV correctly?"
       puts "*" * 80
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 22.4.2
+  version: 22.4.4
 platform: ruby
 authors:
 - Christian Sedlmair