You are viewing a plain text version of this content. The canonical link for it is here.
Posted to lokahi-commits@incubator.apache.org by to...@apache.org on 2006/07/11 19:24:32 UTC
svn commit: r420950 - in /incubator/lokahi/lokahi/trunk: docs/README.TXT
src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java
src/www/Apache/Worker/confirm.vm src/www/Tomcat/Worker/confirm.vm
Author: toback
Date: Tue Jul 11 12:24:32 2006
New Revision: 420950
URL: http://svn.apache.org/viewvc?rev=420950&view=rev
Log:
small change to help apache httpd graceful.
Modified:
incubator/lokahi/lokahi/trunk/docs/README.TXT
incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java
incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm
incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm
Modified: incubator/lokahi/lokahi/trunk/docs/README.TXT
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/docs/README.TXT?rev=420950&r1=420949&r2=420950&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/docs/README.TXT (original)
+++ incubator/lokahi/lokahi/trunk/docs/README.TXT Tue Jul 11 12:24:32 2006
@@ -30,6 +30,7 @@
inital.instance.name=
inital.user.name=
install.location=${tomcat.home}/webapps/
+ agent.install.location=
----
3. Download external libraries to lib/ directory:
Modified: incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java?rev=420950&r1=420949&r2=420950&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java (original)
+++ incubator/lokahi/lokahi/trunk/src/java/org/apache/lokahi/core/agent/task/HttpsdctlTask.java Tue Jul 11 12:24:32 2006
@@ -31,7 +31,7 @@
public class HttpsdctlTask extends AbstractAgentTask<String> {
HttpsdctlTask(int jobId, TaskType t, String apacheRoot, String command) {
- this.task = new FutureTask<String>(new CommandLineProcess(PropertiesFile.getConstantValue("path.to.sudo"), apacheRoot.trim() + "/bin/apachectl", command));
+ this.task = new FutureTask<String>(new CommandLineProcess(PropertiesFile.getConstantValue("path.to.sudo"), apacheRoot.trim() + "/bin/apachectl", "-k", command));
this.setJobId(jobId);
this.setType(t);
}
Modified: incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm?rev=420950&r1=420949&r2=420950&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Apache/Worker/confirm.vm Tue Jul 11 12:24:32 2006
@@ -22,6 +22,7 @@
<br />
<input type="submit" value="$buttonName">
<br />
+ <br />
$methodToCall
<input type=hidden name=id value="$individual.getPk()">
$individual.getName()
Modified: incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm
URL: http://svn.apache.org/viewvc/incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm?rev=420950&r1=420949&r2=420950&view=diff
==============================================================================
--- incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm (original)
+++ incubator/lokahi/lokahi/trunk/src/www/Tomcat/Worker/confirm.vm Tue Jul 11 12:24:32 2006
@@ -16,12 +16,16 @@
## $Id$
##
#if ($User.isAllowed($function) && $methodToCall && $actionLink)
+<div class="messagebox">
<form name="Form" method="post" action='$link.setAction($actionLink)'>
<input type=hidden name="methodToCall" value="$methodToCall">
+ <br />
<input type="submit" value="$buttonName"><br />
+ <br />
$methodToCall
<input type=hidden name=id value="$individual.getPk()">
$individual.getName()
</form>
+</div>
#end