Changeset 1216

Show
Ignore:
Timestamp:
01/08/08 19:54:13 (9 months ago)
Author:
v..@exdolo.com
Message:

- fix require paths for upload_progress and drb_server, so DRB works
- add :start_drb: true example option to merb.yml template config so new users know it's required for DRB to work

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/templates/config/merb.yml

    r1136 r1216  
    4444# Uncomment and set this if you want to run a drb server for upload progress 
    4545# or other drb services. 
     46#:start_drb: true 
    4647#:drb_server_port: 32323 
    4748 

  • trunk/lib/merb/drb_server.rb

    r399 r1216  
    11require 'drb' 
    2 require File.dirname(__FILE__)+'/merb_upload_progress' 
     2require File.dirname(__FILE__)+'/upload_progress' 
    33 
    44module Merb 

  • trunk/lib/merb/server.rb

    r1208 r1216  
    645645      def drbserver_start(port) 
    646646        puts "Starting merb drb server on port: #{port}" 
    647         require 'merb/merb_drb_server' 
    648         drb_init = File.join(@@merb_opts[:merb_root], "/config/merb_drb_init") 
     647        require 'merb/drb_server' 
     648        drb_init = File.join(@@merb_opts[:merb_root], "/config/drb_init") 
    649649        require drb_init if File.exist?(drb_init) 
    650650        DRb.start_service("druby://#{@@merb_opts[:host]}:#{port}", Merb::DrbServiceProvider)