Download as
Browse Code »

Commit efe67a46d7980e93f2fd1eef076d820ab0dff448

Authored by Antonio Terceiro
1 parent c5b5a296
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

move "is noosfero running?" test to script/production

Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
etc/init.d/noosfero
  Diff comments   View file @efe67a4
@@ -123,7 +123,7 @@ do_restart() { @@ -123,7 +123,7 @@ do_restart() {
123 } 123 }
124 124
125 running(){ 125 running(){
126 - pgrep -u noosfero -f 'thin server' > /dev/null 126 + main_script running
127 } 127 }
128 128
129 case "$1" in 129 case "$1" in
script/production
  Diff comments   View file @efe67a4
@@ -84,6 +84,12 @@ environments_loop() { @@ -84,6 +84,12 @@ environments_loop() {
84 fi 84 fi
85 } 85 }
86 86
  87 +do_running() {
  88 + pids=$(cat tmp/pids/thin.*.pid 2>/dev/null || true)
  89 + # passes if any of $pids exist, fails otherwise
  90 + kill -0 $pids > /dev/null 2>&1
  91 +}
  92 +
87 case "$ACTION" in 93 case "$ACTION" in
88 start|stop) 94 start|stop)
89 do_$ACTION 95 do_$ACTION
@@ -100,6 +106,10 @@ case "$ACTION" in @@ -100,6 +106,10 @@ case "$ACTION" in
100 do_restart 106 do_restart
101 ;; 107 ;;
102 108
  109 + running)
  110 + do_running
  111 + ;;
  112 +
103 *) 113 *)
104 echo "usage: $0 start|stop|restart|run" 114 echo "usage: $0 start|stop|restart|run"
105 exit 1 115 exit 1