mirror of
https://github.com/mistergibson/gxg-server.git
synced 2026-10-19 06:59:44 -07:00
Dep bug fix for mimemagic
This commit is contained in:
parent
69ec7a480b
commit
b7533c6c9d
3 changed files with 26 additions and 21 deletions
|
|
@ -12,7 +12,7 @@ module Gem::UserInteraction
|
|||
def terminate_interaction(exit_code = 0)
|
||||
# Suppress the instruction to exit ruby:
|
||||
# ui.terminate_interaction exit_code
|
||||
end
|
||||
end
|
||||
end
|
||||
#
|
||||
class Object
|
||||
|
|
@ -1801,7 +1801,7 @@ core_service.on(:at_start, {:description => "System Service Layer Startup", :usa
|
|||
::GxG::Engine::determine_loads()
|
||||
end
|
||||
end
|
||||
core_service.on(:at_stop, {:description => "System Service Layer Shutdown", :usage => "{ :at_stop => (service-object) }", :public => false}) do |service|
|
||||
core_service.on(:at_stop, {:description => "System Service Layer Shutdown", :usage => "{ :at_stop => (service-object) }", :public => false}) do |service, credential|
|
||||
# ### Stop Services
|
||||
::GxG::Services::stop_order().each do |the_service_moniker|
|
||||
unless the_service_moniker == :core
|
||||
|
|
@ -1838,16 +1838,6 @@ core_service.on(:at_stop, {:description => "System Service Layer Shutdown", :usa
|
|||
end
|
||||
#
|
||||
end
|
||||
# ### Startup Scripts
|
||||
Dir.entries("#{::GxG::SYSTEM_PATHS[:system]}/Startup").each do |entry|
|
||||
if File.extname(entry) == ".rb"
|
||||
begin
|
||||
require "#{::GxG::SYSTEM_PATHS[:system]}/Startup/#{entry}"
|
||||
rescue Exception => the_error
|
||||
log_error({:error => the_error})
|
||||
end
|
||||
end
|
||||
end
|
||||
#
|
||||
end
|
||||
# ### Provide Universal Resouce Access
|
||||
|
|
@ -1890,6 +1880,17 @@ Signal.trap("HUP") do
|
|||
exit(0)
|
||||
end
|
||||
#
|
||||
# ### Startup Scripts
|
||||
Dir.entries("#{::GxG::SYSTEM_PATHS[:system]}/Startup").each do |entry|
|
||||
if File.extname(entry) == ".rb"
|
||||
begin
|
||||
require "#{::GxG::SYSTEM_PATHS[:system]}/Startup/#{entry}"
|
||||
rescue Exception => the_error
|
||||
log_error({:error => the_error})
|
||||
end
|
||||
end
|
||||
end
|
||||
#
|
||||
unless ($0 == "irb" || $0 == "jirb" || Module.constants.include?(:IRB))
|
||||
# ### Place-holder loop for running in the background
|
||||
while true do
|
||||
|
|
|
|||
Loading…
Reference in a new issue