Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [2006] [RHQ-246] remove solaris specific code - i ran a test on our solaris box with this change and the server started/stopped normally.
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [2006] [RHQ-246] remove solaris specific code - i ran a test on our solaris box with this change and the server started/stopped normally.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>2006</dd> <dt>Author</dt> <dd>mazz</dd> <dt>Date</dt> <dd>2008-11-15 14:14:50 -0600 (Sat, 15 Nov 2008)</dd> </dl> <h3>Log Message</h3> <pre>[RHQ-246] remove solaris specific code - i ran a test on our solaris box with this change and the server started/stopped normally. this also takes the kill -9 that we were doing on solaris that happened 2 seconds after we tried to kill with -TERM, which did not give the server much time to cleanup after itself</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulesenterpriseservercontainersrcmainbinresourcesbinrhqserversh">rhq/trunk/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulesenterpriseservercontainersrcmainbinresourcesbinrhqserversh"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh (2005 => 2006)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh 2008-11-15 17:10:19 UTC (rev 2005) +++ rhq/trunk/modules/enterprise/server/container/src/main/bin-resources/bin/rhq-server.sh 2008-11-15 20:14:50 UTC (rev 2006) </span><span class="lines">@@ -339,20 +339,11 @@ </span><span class="cx"> echo Trying to stop the RHQ Server... </span><span class="rem">- if [ -n "$_SOLARIS" ]; then - kill -TERM `cat ${RHQ_SERVER_HOME}/jbossas/.jboss_pid` - sleep 3 - fi - </span><span class="cx"> echo "RHQ Server (pid=${PID}) is stopping..." while [ "$RUNNING" = "1" ]; do kill -TERM $PID sleep 2 </span><span class="rem">- if [ -n "$_SOLARIS" ]; then - kill -9 $PID - sleep 2 - fi </span><span class="cx"> check_status "stopping..." done </span><span class="lines">@@ -370,20 +361,11 @@ </span><span class="cx"> echo Trying to kill the RHQ Server... </span><span class="rem">- if [ -n "$_SOLARIS" ]; then - kill -9 `cat ${RHQ_SERVER_HOME}/jbossas/.jboss_pid` - sleep 3 - fi - </span><span class="cx"> echo "RHQ Server (pid=${PID}) is being killed..." while [ "$RUNNING" = "1" ]; do kill -9 $PID sleep 2 </span><span class="rem">- if [ -n "$_SOLARIS" ]; then - kill -9 $PID - sleep 2 - fi </span><span class="cx"> check_status "killing..." done </span> </pre> </div> </div> </body> </html> |