pakyow-core 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b25fae34605893ca73a6ae5f244b0705eab56f924a5383982d204034e76bc4ff
-  data.tar.gz: 9774485b7de8a3a2366ec51c5d6ff442a4f4c75d20707c3cccc2a07ded3d316e
+  metadata.gz: e4c1c5f27fb6ffae904ba62198bb53ce289f6c1f31336dd822fca00b126d95c8
+  data.tar.gz: de38ff2a793f66cebad1a1170c02e6b3978e07b38c8d973ac661efeb049e93ec
 SHA512:
-  metadata.gz: 7322f92da626b39fab842d3003d0dee9efe58fae5c7d03771b369ca0d3750f5e55f5c6342ce225140fd29b0ac6e53fc44947f8de1b35337156246de9507ec38e
-  data.tar.gz: b378d973b2a88d880aff0e6eb4538670e14cba02ab67b6b5f3a86212fc87dbd8668b66003e25dfcc19772aeddc8cc084663eb0e0d46c5340ac76c9a18dcbe177
+  metadata.gz: 6961b873b166f4d74ce23d7b9b86cd66f958e78b8371a3359c7044fdaa5b835a398356714663858ce897726cbd427104e6663bbf12a09b163dff815fc47316ef
+  data.tar.gz: 645210420f9bb6a5cc63ba794893d697642842f9de561fe5e00d9b93ee1831230bdcf860024630574e728992b40f40512ae2bc619648c9012480002f5a6d45f7

data/CHANGELOG.md

@@ -1,4 +1,31 @@
-# v1.0.2 (unreleased)
+# v1.0.3 (unreleased)
+
+  * `fix` **Resolve several issues with respawns, restarts.**
+
+    *Related links:*
+    - [Pull Request #342][pr-342]
+
+  * `fix` **Ensure a logger and output is always available in the environment.**
+
+    *Related links:*
+    - [Pull Request #331][pr-331]
+
+  * `fix` **Start multiple processes when the process count specifies more than one.**
+
+    *Related links:*
+    - [Pull Request #329][pr-329]
+
+  * `fix` **Prevent failed processes from restarting indefinitely.**
+
+    *Related links:*
+    - [Pull Request #328][pr-328]
+
+[pr-342]: https://github.com/pakyow/pakyow/pull/342
+[pr-331]: https://github.com/pakyow/pakyow/pull/331
+[pr-329]: https://github.com/pakyow/pakyow/pull/329
+[pr-328]: https://github.com/pakyow/pakyow/pull/328
+
+# v1.0.2
 
   * `fix` **Relocate `version.rb` from the meta gem into `pakyow/core`.**
     - Makes it possible to use `pakyow/core` and other gems without needing the meta gem.

data/lib/pakyow/application/behavior/restarting.rb

@@ -44,6 +44,11 @@ module Pakyow
           end
         end
 
+        def touch_restart
+          FileUtils.mkdir_p(File.join(config.root, "tmp"))
+          FileUtils.touch(File.join(config.root, "tmp/restart.txt"))
+        end
+
         private
 
         def setup_for_restarting
@@ -53,15 +58,14 @@ module Pakyow
 
             # FIXME: this doesn't need to be hardcoded, but instead determined
             # from the source location when registered with the environment
-            config.process.watched_paths << "./config/application.rb"
+            config.process.watched_paths << File.join(config.root, "config/application.rb")
 
             Thread.new do
               Filewatcher.new(
                 config.process.watched_paths,
                 exclude: config.process.excluded_paths
               ).watch do |_path, _event|
-                FileUtils.mkdir_p "./tmp"
-                FileUtils.touch "./tmp/restart.txt"
+                touch_restart
               end
             end
           end

data/lib/pakyow/behavior/restarting.rb

@@ -13,13 +13,13 @@ module Pakyow
 
           # Other processes (e.g. apps) can touch this file to restart the server.
           #
-          watch "./tmp/restart.txt" do
+          watch File.join(config.root, "tmp/restart.txt") do
             restart
           end
 
           # Automatically bundle.
           #
-          watch "./Gemfile" do
+          watch File.join(config.root, "Gemfile") do
             Bundler.with_clean_env do
               Support::CLI::Runner.new(message: "Bundling").run("bundle install")
             end
@@ -27,7 +27,7 @@ module Pakyow
 
           # Respawn when the bundle changes.
           #
-          watch "./Gemfile.lock" do
+          watch File.join(config.root, "Gemfile.lock") do
             respawn
           end
 
@@ -44,7 +44,9 @@ module Pakyow
           # Set the respawn flag and stop the process manager.
           # Pakyow will check the flag and respawn from the main thread.
           #
-          @respawn = true; @process_manager.stop
+          @respawn = true
+          @bound_endpoint.close
+          @process_manager.stop
         end
       end
     end

data/lib/pakyow/behavior/running.rb

@@ -16,7 +16,7 @@ module Pakyow
       extend Support::Extension
 
       apply_extension do
-        unfreezable :process_manager
+        unfreezable :process_manager, :bound_endpoint
 
         class_state :processes, default: []
 
@@ -42,7 +42,7 @@ module Pakyow
             "http://#{config.server.host}:#{port}"
           )
 
-          bound_endpoint = Async::Reactor.run {
+          @bound_endpoint = Async::Reactor.run {
             Async::IO::SharedEndpoint.bound(endpoint)
           }.wait
 
@@ -52,7 +52,7 @@ module Pakyow
             Processes::Server.new(
               protocol: endpoint.protocol,
               scheme: endpoint.scheme,
-              endpoint: bound_endpoint
+              endpoint: @bound_endpoint
             ).run
           end
 
@@ -69,7 +69,7 @@ module Pakyow
           @processes << {
             name: name,
             block: block,
-            count: count,
+            count: count.to_i,
             restartable: restartable
           }
         end
@@ -100,7 +100,7 @@ module Pakyow
             #
             exec "PW_RESPAWN=true #{$0} #{ARGV.join(" ")}"
           end
-        rescue SignalException
+        rescue SignalException, Interrupt
           exit
         end
 
@@ -114,6 +114,7 @@ module Pakyow
           Pakyow.logger << "Goodbye"
 
           performing :shutdown do
+            @bound_endpoint.close
             @process_manager.stop
           end
         end

data/lib/pakyow/environment.rb

@@ -33,6 +33,7 @@ require "pakyow/actions/normalizer"
 
 require "pakyow/application"
 
+require "pakyow/logger"
 require "pakyow/logger/destination"
 require "pakyow/logger/multiplexed"
 require "pakyow/logger/thread_local"
@@ -135,17 +136,32 @@ module Pakyow
     #
     attr_reader :env
 
-    # Logger instance for the environment
+    # Any error encountered during the boot process
     #
-    attr_reader :logger
+    attr_reader :error
 
-    # Global logger instance
+    # Global log output.
+    #
+    # Builds and returns a default global output that's replaced in `setup`.
     #
-    attr_reader :global_logger
+    def global_logger
+      unless defined?(@global_logger)
+        require "pakyow/logger/formatters/human"
+        @global_logger = Logger::Formatters::Human.new(
+          Logger::Destination.new(:stdout, $stdout)
+        )
+      end
 
-    # Any error encountered during the boot process
+      @global_logger
+    end
+
+    # Logger instance for the environment.
     #
-    attr_reader :error
+    # Builds and returns a default logger that's replaced in `setup`.
+    #
+    def logger
+      @logger ||= Logger.new("dflt", output: global_logger, level: :all)
+    end
 
     # Mounts an app at a path.
     #
@@ -200,20 +216,24 @@ module Pakyow
       end
 
       performing :setup do
-        init_global_logger
+        destinations = Logger::Multiplexed.new(
+          *config.logger.destinations.map { |destination, io|
+            io.sync = config.logger.sync
+            Logger::Destination.new(destination, io)
+          }
+        )
+
+        @global_logger = config.logger.formatter.new(destinations)
+
+        @logger = Logger::ThreadLocal.new(
+          Logger.new("pkyw", output: @global_logger, level: config.logger.level)
+        )
+
+        Console.logger = Logger.new("asnc", output: @global_logger, level: :warn)
       end
 
       self
     rescue => error
-      begin
-        # Try again to initialize the logger, since we may have failed before that point.
-        #
-        unless Pakyow.logger
-          init_global_logger
-        end
-      rescue
-      end
-
       @setup_error = error; self
     end
 
@@ -344,23 +364,6 @@ module Pakyow
 
     private
 
-    def init_global_logger
-      destinations = Logger::Multiplexed.new(
-        *config.logger.destinations.map { |destination, io|
-          io.sync = config.logger.sync
-          Logger::Destination.new(destination, io)
-        }
-      )
-
-      @global_logger = config.logger.formatter.new(destinations)
-
-      @logger = Logger::ThreadLocal.new(
-        Logger.new("pkyw", output: @global_logger, level: config.logger.level)
-      )
-
-      Console.logger = Logger.new("asnc", output: @global_logger, level: :warn)
-    end
-
     def ensure_setup_succeeded
       if @setup_error
         handle_boot_failure(@setup_error)
@@ -370,23 +373,11 @@ module Pakyow
     def handle_boot_failure(error)
       @error = error
 
-      safe_logger do |logger|
-        if logger.respond_to?(:houston)
-          logger.houston(error)
-        else
-          logger.error(error)
-        end
-      end
+      logger.houston(error)
 
       if config.exit_on_boot_failure
         exit(false)
       end
     end
-
-    require "logger"
-
-    def safe_logger
-      yield logger || ::Logger.new($stdout)
-    end
   end
 end

data/lib/pakyow/process_manager.rb

@@ -36,18 +36,23 @@ module Pakyow
     private
 
     def run_process(process)
-      Fiber.new {
-        until @stopped
-          status = @group.fork(process) {
-            begin
-              Async::Reactor.run(&process[:block])
+      process[:count].times do
+        Fiber.new {
+          until @stopped
+            status = @group.fork(process) do
+              Async do
+                process[:block].call
+              rescue => error
+                Pakyow.logger.houston(error)
+                exit 1
+              end
             rescue Interrupt
             end
-          }
 
-          break unless status.success?
-        end
-      }.resume
+            break unless status.success?
+          end
+        }.resume
+      end
     end
   end
 end

data/lib/pakyow/validator.rb

@@ -62,9 +62,9 @@ module Pakyow
       @validations.any?
     end
 
-    def validate(validation_name = nil, **options)
+    def validate(validation_name = nil, **options, &block)
       validation_object = if block_given?
-        Validations::Inline.new(validation_name, Proc.new)
+        Validations::Inline.new(validation_name, block)
       else
         self.class.validation_object_for(validation_name)
       end

data/lib/pakyow/version.rb

@@ -3,5 +3,5 @@
 module Pakyow
   # Pakyow's current version.
   #
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-core
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: commands
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2019-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-support
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement