Set the version of the parent kirk in the sub process

rkh · Feb 24, 2011 · 87a05d1 · 87a05d1
1 parent 237aeae
commit 87a05d1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/lib/kirk.rb b/lib/kirk.rb
@@ -29,7 +29,7 @@ module Kirk
   java_import "java.util.logging.ConsoleHandler"
 
   def self.sub_process?
-    !!defined?(Kirk::SUB_PROCESS)
+    !!defined?(Kirk::PARENT_VERSION)
   end
 
   # Configure the logger

diff --git a/lib/kirk/server/application_config.rb b/lib/kirk/server/application_config.rb
@@ -44,5 +44,13 @@ def getEnvironment
 
       map
     end
+
+    def getKirkVersionStamper
+      <<-RUBY
+        module Kirk
+          PARENT_VERSION = #{VERSION.inspect}.freeze
+        end
+      RUBY
+    end
   end
 end
diff --git a/lib/kirk/server/bootstrap.rb b/lib/kirk/server/bootstrap.rb
@@ -1,8 +1,6 @@
 require 'java'
 
 module Kirk
-  SUB_PROCESS = true
-
   class Server
     class Bootstrap
       def warmup(application_path)

diff --git a/src/com/strobecorp/kirk/ApplicationConfig.java b/src/com/strobecorp/kirk/ApplicationConfig.java
@@ -8,6 +8,7 @@ public interface ApplicationConfig {
   public String             getApplicationPath();
   public String             getRackupPath();
   public String             getBootstrapPath();
+  public String             getKirkVersionStamper();
   public Map                getEnvironment();
   public LifeCycle.Listener getLifeCycleListener();
 

diff --git a/src/com/strobecorp/kirk/Deploy.java b/src/com/strobecorp/kirk/Deploy.java
@@ -49,6 +49,7 @@ public void terminate() {
   private void initializeScriptingContext() {
     context = new ScriptingContainer(LocalContextScope.SINGLETHREAD);
     context.setEnvironment(config.getEnvironment());
+    context.runScriptlet(config.getKirkVersionStamper());
 
     this.bootstrapper = context.runScriptlet(
       PathType.ABSOLUTE, config.getBootstrapPath());