svelte-on-rails 22.4.3 → 22.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b8bd4010aba17f12d8f78b7066f4aaf4ea60673302bd4f9473211ee9fe9fb5a
-  data.tar.gz: c20bb9f2639d4633f9716d7e417a2be1776d08341fe08362323466786c9d9f19
+  metadata.gz: c20418140ddcc6c13f764825f0fb67fc0753d5cf111b6ca4dd536c791b8aa15a
+  data.tar.gz: ffcee0dc8b10538a673c3c1e2992f11b2a1c3b03de2d06d761ddd7ebd343c3b9
 SHA512:
-  metadata.gz: 58104ed4039aa24c2465782c200927ac4d32420c456dc2d48cac3de852d0de7c3fa791345a505f1a37dac694e57d7f10a9920b2f090c25dd55d57954c7e3575f
-  data.tar.gz: 2675e7072ebca48162cc744b59378c72f9c9ab52948c559087c2049631b89062dd1da8b820e3eed389ba7abb74e72d7cd8704d8dd0a065766eb5c12adb70f536
+  metadata.gz: 6f3b8e485b02bc666cb9dcb6876941ab4c0781c9ab834e1fb5390a0327c83ba201f8d3e4219c4a0edd230e608f50d09b6508cd43dff25958f645ca402b489af9
+  data.tar.gz: b713bfea90974924c29f92374daa4196f7c15a70e9baf47fe7593048ac2af4f8c8b1b8917913de975bf80cc1a4f00c111fe03fbe3dc696fc9be9295dad6a2dab

data/lib/svelte_on_rails/ssr_client.rb

@@ -37,7 +37,7 @@ module SvelteOnRails
         start_node_server!
 
         at_exit do
-          @helpers.shutdown
+          @helpers.shutdown(caller: 'at_exit')
           File.delete(restart_marker_file) if File.exist?(restart_marker_file)
         end
       else
@@ -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
 
@@ -229,7 +234,7 @@ module SvelteOnRails
       Rails.logger.error(msg)
       SvelteOnRails::Lib::Utils.ssr_server_log("[ERROR] #{msg}")
 
-      @helpers.shutdown
+      @helpers.shutdown(caller: 'restart')
       begin
         start_node_server!("#{tag.gsub(' ', '-') + '-' if tag}#{count}", restart_after_failure: true)
       rescue
@@ -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
 
@@ -393,10 +398,11 @@ module SvelteOnRails
       delete_sockets(leftover_sockets(current_ppid: current_ppid).map { |s| s[:path] }, label: "leftover")
     end
 
-    def shutdown(current_ppid: Process.ppid)
+    def shutdown(current_ppid: Process.ppid, caller: '')
+      SvelteOnRails::Lib::Utils.ssr_server_log("Shutting down SSR client, ppid: #{current_ppid} (#{caller})")
       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,7 +414,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}")
+        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.3
+  version: 22.4.5
 platform: ruby
 authors:
 - Christian Sedlmair