svelte-on-rails 22.0.1 → 22.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 654ebb949c5d6c082995ebed85078b49c35e4e88acbcb1d7e43903ff3b63a460
-  data.tar.gz: 90865d574782129ef12b50494d48c012a25e581e97fc6f30de6f5629d1b8b108
+  metadata.gz: 89170a8dfaf49bc474ff1edfd3ba74a78d64dd54af2913cd29cbfd754b06c394
+  data.tar.gz: adf0042767c8fd3449d5c1ffcc015e15de6f5240fb2af5a7c3245ec6f718e1cf
 SHA512:
-  metadata.gz: 24a26fb36a9fa5f82222a45c660dc1f89bdd0ca6d46b7e9e8d85060176682ebb920edade613613af7f5ffa60b2bda6b91a20d84eba2e57ac6d51426f13e9c574
-  data.tar.gz: 82ece3ee4d4c8f2f2674d6420bec3994edd517e7daade03c4bae619f1fb7d22dc533a925572eebe9f110ac6161c8cb33e4fed57af0c59f074d1f7fa1c89414b7
+  metadata.gz: d81f67a3ece83223ba30d35cbda6f070179ec9f7dccc85d6957a410c781dac760e83fd72e3b93781135eb1a080ec6e2f19c6789cff11e2b10d223cc4ea843822
+  data.tar.gz: e2ab8b1d993c31c743fe35929e6a6efd5ffc364f684264c70e3d9a6b2a3a5304c584d2fe959b759f542396b5c0b76d07acc5af8e5a1883c07cba970b2cd014f0

data/lib/svelte_on_rails/lib/utils.rb

@@ -155,6 +155,10 @@ module SvelteOnRails
 
       # Log for debugging purposes
       def self.secure_debug_log(line)
+
+        puts "[SOR] #{line}"
+        $stdout.flush
+
         # base = Rails.root.join('tmp')
 
         # FileUtils.mkdir_p(base) unless File.directory?(base)

data/lib/svelte_on_rails/ssr_server.rb

@@ -24,6 +24,7 @@ module SvelteOnRails
       SvelteOnRails::Lib::Utils.secure_debug_log("SOR Server initialize called")
 
       @helpers = SsrServerHelpers.new
+      @helpers.logfile.delete if @helpers.logfile.exist?
 
       @logfile_path = Rails.root.join("log/svelte-ssr-server-#{Rails.env}.log")
       @logfile_max_lines = build_logfile_max_lines
@@ -168,9 +169,13 @@ module SvelteOnRails
       end
     end
 
-    def start_node_server!(started_by = "rails-boot-#{Rails.env}-#{Process.ppid}")
+    def start_node_server!(
+      started_by = "rails-boot-#{Rails.env}-#{Process.ppid}",
+      restart_after_failure: false
+    )
 
-      SvelteOnRails::Lib::Utils.secure_debug_log("SOR start_node_server! called")
+      @helpers.secure_log("test log")
+      SvelteOnRails::Lib::Utils.secure_debug_log("SOR start_node_server! called") if restart_after_failure
 
       # notice ppid
       FileUtils.mkdir_p(@helpers.ssr_server_ppid_file.dirname)
@@ -190,28 +195,28 @@ module SvelteOnRails
           status: status
         }
       end
-      @helpers.start_server_log(start, "Node Version: #{Configuration.instance.node_version_test}, package version: #{Configuration.instance.npm_package_version_test}")
-      @helpers.start_server_log(start, "Start running Svelte-SSR-Server... (#{started_by})")
+      @helpers.secure_log("Node Version: #{Configuration.instance.node_version_test}, package version: #{Configuration.instance.npm_package_version_test}")
+      @helpers.secure_log("Start running Svelte-SSR-Server... (#{started_by})")
 
       until node_server_pid do
         sleep 0.12
-        @helpers.start_server_log(start, "Waiting for node server process-id")
+        @helpers.secure_log("Waiting for node server process-id")
         start_server_timeout!(start)
       end
 
       until File.exist?(socket_path) do
         sleep 0.1
-        @helpers.start_server_log(start, "Waiting for socket to be created")
+        @helpers.secure_log("Waiting for socket to be created")
         start_server_timeout!(start)
       end
-      @helpers.start_server_log(start, "Socket created: #{socket_path}")
+      @helpers.secure_log("Socket created: #{socket_path}")
 
       until ping? do
-        @helpers.start_server_log(start, "Waiting for successful server-response")
+        @helpers.secure_log("Waiting for successful server-response")
         start_server_timeout!(start)
         sleep 0.1
       end
-      @helpers.start_server_log(start, "Server responded successfully")
+      @helpers.secure_log("Server responded successfully")
 
       @helpers.cleanup_leftover_processes
     end
@@ -219,7 +224,10 @@ module SvelteOnRails
     def restart_my_server(tag = nil)
 
       marker = restart_marker_file
-      return if File.exist?(marker) && File.mtime(marker) > 1.minute.ago
+      if File.exist?(marker) && File.mtime(marker) > 10.seconds.ago
+        SvelteOnRails::Lib::Utils.secure_debug_log("[ERROR] Prevented Server Restart because server was restarted too recently: #{marker}")
+        return
+      end
 
       FileUtils.mkdir_p(marker.dirname)
       File.open(marker, "a") { |f| f.puts(Time.now.utc.iso8601) }
@@ -231,7 +239,7 @@ module SvelteOnRails
 
       @helpers.shutdown
       begin
-        start_node_server!("#{tag.gsub(' ', '-') + '-' if tag}#{count}")
+        start_node_server!("#{tag.gsub(' ', '-') + '-' if tag}#{count}", restart_after_failure: true)
       rescue
       end
     end
@@ -359,7 +367,7 @@ module SvelteOnRails
       FileUtils.mkdir_p(dir)
       FileUtils.chmod(0777, dir)
       fallback = Pathname.new("#{dir}/#{@socket_namespace}-#{ppid}.sock")
-      start_server_log(nil, "sockets longer than 104 chars are risky, fallback to: #{fallback}")
+      secure_log("sockets longer than 104 chars are risky, fallback to: #{fallback}")
       fallback
     end
 
@@ -399,11 +407,17 @@ module SvelteOnRails
       File.delete(ssr_server_ppid_file) if File.exist?(ssr_server_ppid_file)
     end
 
-    def start_server_log(start_time, msg)
-      line = start_time ? "[SOR] #{msg} (#{((Time.now - start_time) * 1000).round(1)}ms)" : "[SOR] #{msg}"
-      puts line
-      $stdout.flush
-      SvelteOnRails::Lib::Utils.secure_debug_log(line)
+    def secure_log(msg)
+
+      File.open(logfile, 'a') do |f|
+        f.sync = true
+        f.puts("[#{Time.now.utc.iso8601(3)} ppid:#{Process.ppid} pid:#{Process.pid}] #{msg}")
+      end
+
+    end
+
+    def logfile
+      Rails.root.join("log", "svelte_ssr_server.log")
     end
 
     private
@@ -417,7 +431,7 @@ module SvelteOnRails
         Process.kill("SIGINT", p.pid) rescue Errno::ESRCH || Errno::EPERM
       end
 
-      start_server_log(nil, "Killed #{processes.length} #{label} process#{'es' if processes.length != 1}")
+      secure_log("Killed #{processes.length} #{label} process#{'es' if processes.length != 1}")
     end
 
     def delete_sockets(socket_paths, label:)
@@ -429,7 +443,7 @@ module SvelteOnRails
         # raced with primary's own cleanup — fine
       end
 
-      start_server_log(nil, "Deleted #{socket_paths.size} #{label} socket#{'s' if socket_paths.size != 1}")
+      secure_log("Deleted #{socket_paths.size} #{label} socket#{'s' if socket_paths.size != 1}")
     end
 
     # All running SSR processes matching our namespace (any ppid).

metadata

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