smart_proxy_dynflow 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmQxZGMzNThkY2I0MmE5YWIyNjk5MjIzY2MyNjMzZDlhMWYzOTVjYQ==
+    ZGJjM2Q5NTZhNzA3YTViZDVlYzA1NjJmOGY4ZTJiYmU3Y2Q2MzE3Mg==
   data.tar.gz: !binary |-
-    NWJiMzIwODcyNzE2NjU3YjllZjMxZGVhZjM5ZmVmMTJjNGEzMzQ0Nw==
+    NzI0Mzk3OWE4NTY1YmFhNzg2OGUxMjNkZDM5ZDQ5Yjk5ZWZjOWVjYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTMyOWQ0YjZmMTAxZmMxZWVmYjA0OThlZDRiMjk3YmIwM2RkOGRkNGNmZDc2
-    MDVmNTdiMjA0N2ZhMzYwZjZmYTk2MWRjMzM2ZDFjYjMyY2QzMTg0NjAzYmMy
-    ZTBiODZiMDk5NTFiM2VlYTk4MWZhZmRlYjRiZDljYTRkNDI5NTY=
+    YTQ3M2YyNDc1YWMwNmMyNWQ3YzJjMWRhY2Y4ZGVjZTNjZTE3NDAxOWJjMTE4
+    MjMxNjUyYjllYjE5ZGRiNTQzODVlMjFkNTZkMmU0ODA0ZmY2ZTE1MDZmMzQ0
+    ZTdjOTkwMGU0YjNmNmRlZGJkYjJmODgwZmY0YTE3N2Q0MjMzYmQ=
   data.tar.gz: !binary |-
-    OTUwMTA4Y2VlZWFlZGE4ZjJhMzE1YTQ5MDQxMzZmNjMxYTU5NWZlNWU0N2Y3
-    MTM5ZGU1Zjk1Yzk3NTE0Y2E0ZWQwOGNmY2U4YjU3YzdjYzkzMjQxMTdhMjNh
-    NGE3Mjc1NWJhMDFiYWM0NGFmMGVmMzI3OTIyYWVlOGEwY2NjMTE=
+    NzhhZTZhZjBkZTUwNDAzYWJmNzg4OTQxMzJlNmEwZWU5NGQzYzVmZDgyOTQz
+    MDY5NTAyNzE1ZWM4NTFhYTA2NGE3ODhmNTAwOWVmODdjNTI4MWM0YTUyZDQ1
+    YWI3MzViZDdmNWRhNThkZTU4YzFkOTQ4MmIwM2IxYTRmZDUxZGY=

data/lib/smart_proxy_dynflow.rb

@@ -38,26 +38,42 @@ class Proxy::Dynflow
     ::Dynflow::LoggerAdapters::Simple.new $stderr, 0
   end
 
-  def web_console
-    require 'dynflow/web'
-    world = @world
-    dynflow_console = ::Dynflow::Web.setup do
-      set :world, world
-    end
-    dynflow_console
-  end
-
   class << self
     attr_reader :instance
 
-    def initialize
+    def ensure_initialized
+      return @instance if @instance
       @instance = Proxy::Dynflow.new
+      after_initialize_blocks.each(&:call)
+      @instance
+    end
+
+    def web_console
+      require 'dynflow/web'
+      dynflow_console = ::Dynflow::Web.setup do
+        # we can't use the proxy's after_actionvation hook, as
+        # it happens before the Daemon forks the process (including
+        # closing opened file descriptors)
+        # TODO: extend smart proxy to enable hooks that happen after
+        # the forking
+        Proxy::Dynflow.ensure_initialized
+        set :world, Proxy::Dynflow.world
+      end
+      dynflow_console
     end
 
     def world
       instance.world
     end
+
+    def after_initialize(&block)
+      after_initialize_blocks << block
+    end
+
+    private
+
+    def after_initialize_blocks
+      @after_initialize_blocks ||= []
+    end
   end
 end
-
-Proxy::Dynflow.initialize

data/lib/smart_proxy_dynflow/http_config.ru

@@ -2,7 +2,7 @@ require 'smart_proxy_dynflow/api'
 
 map "/dynflow" do
   map '/console' do
-    run Proxy::Dynflow.instance.web_console
+    run Proxy::Dynflow.web_console
   end
 
   map '/'do

data/lib/smart_proxy_dynflow/testing.rb

@@ -11,6 +11,7 @@ module Proxy
     module Testing
       class << self
         def create_world(&block)
+          Proxy::Dynflow.ensure_initialized
           Proxy::Dynflow.instance.create_world do |config|
             config.exit_on_terminate = false
             config.auto_terminate    = false

data/lib/smart_proxy_dynflow/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   class Dynflow
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dynflow
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ivan Nečas