Add another boundary for sentinel handling to make testInitCannotBeCalledMoreThanOnce work
diff --git a/core/ruby2.5Action/rackapp/init.rb b/core/ruby2.5Action/rackapp/init.rb
index 55f7151..4b9dcf4 100644
--- a/core/ruby2.5Action/rackapp/init.rb
+++ b/core/ruby2.5Action/rackapp/init.rb
@@ -8,6 +8,7 @@
def call(env)
# Make sure that this action is not initialised more than once
if File.exist? CONFIG then
+ puts "Error: Cannot initialize the action more than once."
return ErrorResponse.new 'Cannot initialize the action more than once.', 403
end
diff --git a/core/ruby2.5Action/rackapp/middleware/sentinel_handler.rb b/core/ruby2.5Action/rackapp/middleware/sentinel_handler.rb
index 3d1d1bf..2161bde 100644
--- a/core/ruby2.5Action/rackapp/middleware/sentinel_handler.rb
+++ b/core/ruby2.5Action/rackapp/middleware/sentinel_handler.rb
@@ -3,7 +3,7 @@
class SentinelHandler < MiddlewareBase
def call(env)
response = @app.call(env)
- if !(env['REQUEST_PATH'] == '/init' && response.status == 200) then
+ if !(env['REQUEST_PATH'] == '/init' && [200,403].include?(response.status)) then
puts response.body if response.status!=200
puts "XXX_THE_END_OF_A_WHISK_ACTIVATION_XXX"
warn "XXX_THE_END_OF_A_WHISK_ACTIVATION_XXX"
