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

fixed a problem where Instiki wouldn't start because

Browse source 
require 'application' was before require 'webrick_server' (?)
This commit is contained in:
Alexey Verkhovsky 2005-01-26 01:02:39 +00:00
parent c1b04185a6
commit 3e4154de82
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
script/server
View file

@ -65,14 +65,17 @@ ENV['RAILS_ENV'] = OPTIONS[:environment]
INSTIKI_DEBUG_LOG = OPTIONS[:verbose] INSTIKI_DEBUG_LOG = OPTIONS[:verbose]
require File.expand_path(File.dirname(__FILE__) + '/../config/environment') require File.expand_path(File.dirname(__FILE__) + '/../config/environment')
WikiService.storage_path = storage_path WikiService.storage_path = storage_path
require 'application'
unless defined? INSTIKI_BATCH_JOB if defined? INSTIKI_BATCH_JOB
require 'application'
else
puts "=> Starting Instiki on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}" puts "=> Starting Instiki on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
puts "=> Data files are stored in #{storage_path}" puts "=> Data files are stored in #{storage_path}"
OPTIONS[:index_controller] = 'wiki'
require 'webrick_server' require 'webrick_server'
require 'application'
OPTIONS[:index_controller] = 'wiki'
ApplicationController.wiki = WikiService.instance ApplicationController.wiki = WikiService.instance
DispatchServlet.dispatch(OPTIONS) DispatchServlet.dispatch(OPTIONS)
end end