deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Moved some things from scripts/server to config/environment.rb

Browse source
This commit is contained in:
Alexey Verkhovsky 2005-01-25 22:06:34 +00:00
parent 9e84693cb2
commit 9f90f083d7
2 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/environment.rb
View file

@ -50,8 +50,14 @@ require 'instiki_errors'
unless defined? RAILS_DEFAULT_LOGGER unless defined? RAILS_DEFAULT_LOGGER
RAILS_DEFAULT_LOGGER = Logger.new(STDERR) RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
RAILS_DEFAULT_LOGGER.level = Logger::INFO
ActionController::Base.logger ||= RAILS_DEFAULT_LOGGER ActionController::Base.logger ||= RAILS_DEFAULT_LOGGER
if defined? INSTIKI_DEBUG_LOG and INSTIKI_DEBUG_LOG
RAILS_DEFAULT_LOGGER.level = Logger::DEBUG
ActionController::Base.logger.level = Logger::DEBUG
else
RAILS_DEFAULT_LOGGER.level = Logger::INFO
ActionController::Base.logger.level = Logger::INFO
end
end end
# Environment-specific configuration. # Environment-specific configuration.

41
script/server
View file

@ -29,14 +29,11 @@ ARGV.options do |opts|
opts.on('-b', '--binding=ip', String, opts.on('-b', '--binding=ip', String,
'Binds Rails to the specified ip.', 'Binds Rails to the specified ip.',
'Default: 127.0.0.1') { |OPTIONS[:ip]| } 'Default: 127.0.0.1') { |OPTIONS[:ip]| }
opts.on('-i', '--index=controller', String,
'Specifies an index controller that requests for root will go to (instead of congratulations screen).'
) { |OPTIONS[:index_controller]| }
opts.on('-e', '--environment=name', String, opts.on('-e', '--environment=name', String,
'Specifies the environment to run this server under (test/development/production).', 'Specifies the environment to run this server under (test/development/production).',
'Default: production') { |OPTIONS[:environment]| } 'Default: production') { |OPTIONS[:environment]| }
opts.on('-d', '--daemon', opts.on('-d', '--daemon',
'Make Rails run as a Daemon (only works if fork is available -- meaning on *nix).' 'Make Instiki run as a Daemon (only works if fork is available -- meaning on *nix).'
) { OPTIONS[:server_type] = WEBrick::Daemon } ) { OPTIONS[:server_type] = WEBrick::Daemon }
opts.on('-s', '--simple', '--simple-server', opts.on('-s', '--simple', '--simple-server',
'[deprecated] Forces Instiki not to run as a Daemon if fork is available.', '[deprecated] Forces Instiki not to run as a Daemon if fork is available.',
@ -57,27 +54,25 @@ ARGV.options do |opts|
opts.parse! opts.parse!
end end
ENV['RAILS_ENV'] = OPTIONS[:environment]
require File.expand_path(File.dirname(__FILE__) + '/../config/environment')
if OPTIONS[:verbose]
ActionController::Base.logger.level = Logger::DEBUG
end
OPTIONS[:index_controller] = 'wiki'
require 'webrick_server'
if OPTIONS[:environment] == 'production' if OPTIONS[:environment] == 'production'
storage_path = OPTIONS[:storage] + "/" + OPTIONS[:port].to_s storage_path = "#{OPTIONS[:storage]}/#{OPTIONS[:port]}"
else else
storage_path = OPTIONS[:storage] + "/" + OPTIONS[:environment] + "/" + OPTIONS[:port].to_s storage_path = "#{OPTIONS[:storage]}/#{OPTIONS[:environment]}/#{OPTIONS[:port]}"
end end
FileUtils.mkdir_p(storage_path) FileUtils.mkdir_p(storage_path)
puts "=> Starting Instiki on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}" ENV['RAILS_ENV'] = OPTIONS[:environment]
puts "=> Data files are stored in #{storage_path}" INSTIKI_DEBUG_LOG = OPTIONS[:verbose]
require File.expand_path(File.dirname(__FILE__) + '/../config/environment')
require 'application'
WikiService.storage_path = storage_path WikiService.storage_path = storage_path
ApplicationController.wiki = WikiService.instance require 'application'
DispatchServlet.dispatch(OPTIONS)
unless defined? INSTIKI_BATCH_JOB
puts "=> Starting Instiki on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
puts "=> Data files are stored in #{storage_path}"
OPTIONS[:index_controller] = 'wiki'
require 'webrick_server'
ApplicationController.wiki = WikiService.instance
DispatchServlet.dispatch(OPTIONS)
end