Download as
Browse Code »

Commit aa60018e1a9a9b831a5615dbb7d62f0a5ff2fa21

Authored by Antonio Terceiro
1 parent d0adb661
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

script/development: handle RAILS_RELATIVE_ROOT_URL better 

thin by default would not watch the development log file
Showing 1 changed file with 17 additions and 1 deletions   Show diff stats
script/development
  Diff comments   View file @aa60018
... ... @@ -5,8 +5,13 @@ set -e
5 5 export RAILS_ENV=development
6 6  
7 7 stop() {
  8 + echo "Stopping ..."
8 9 ./script/delayed_job stop
9 10 ./script/feed-updater stop
  11 + if [ -f tmp/pids/thin.pid ]; then
  12 + kill -9 $(cat tmp/pids/thin.pid)
  13 + rm -f tmp/pids/thin.pid
  14 + fi
10 15 exit
11 16 }
12 17  
... ... @@ -15,7 +20,18 @@ start() {
15 20 ./script/feed-updater start
16 21 ./script/delayed_job start
17 22 trap stop INT TERM
18   - rails s $@
  23 + if [ -z "$RAILS_RELATIVE_URL_ROOT" ]; then
  24 + rails s $@
  25 + else
  26 + mkdir -p log
  27 + touch log/development.log
  28 + thin \
  29 + --prefix "$RAILS_RELATIVE_URL_ROOT" \
  30 + --pid tmp/pids/thin.pid \
  31 + --daemonize \
  32 + start
  33 + tail -n 0 -f log/development.log || true
  34 + fi
19 35 }
20 36  
21 37 start $@
... ...