Author: michiel
Date: 2010-05-03 14:44:59 +0200 (Mon, 03 May 2010)
New Revision: 42086
Modified:
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronDaemon.java
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntry.java
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/NodeCronEntry.java
Log:
some people change the node in the nodeentry itself (e.g. the configuration).
This should however not influence the job
Modified:
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronDaemon.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronDaemon.java
2010-05-03 12:25:14 UTC (rev 42085)
+++
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronDaemon.java
2010-05-03 12:44:59 UTC (rev 42086)
@@ -85,7 +85,8 @@
synchronized(runningJobs) {
switch (event.getType()) {
case Events.STARTED: runningJobs.add(event.getEntry()); break;
- case Events.INTERRUPTED: log.service("Removing " + event + " from
" + runningJobs);
+ case Events.INTERRUPTED:
+ log.service("Removing " + event + " from " + runningJobs);
case Events.DONE :
if (! runningJobs.remove(event.getEntry())) {
log.warn("" + event + " was not administrated as running
in: " + runningJobs);
Modified:
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntry.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntry.java
2010-05-03 12:25:14 UTC (rev 42085)
+++
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/CronEntry.java
2010-05-03 12:44:59 UTC (rev 42086)
@@ -399,7 +399,6 @@
result = HashCodeUtil.hashCode(result, name);
result = HashCodeUtil.hashCode(result, className);
result = HashCodeUtil.hashCode(result, cronTime);
- result = HashCodeUtil.hashCode(result, configuration);
return result;
}
Modified:
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/NodeCronEntry.java
===================================================================
---
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/NodeCronEntry.java
2010-05-03 12:25:14 UTC (rev 42085)
+++
mmbase/branches/MMBase-1_9/applications/crontab/src/main/java/org/mmbase/applications/crontab/builders/NodeCronEntry.java
2010-05-03 12:44:59 UTC (rev 42086)
@@ -1,10 +1,10 @@
/*
- This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
+ This software is OSI Certified Open Source Software.
+ OSI Certified is a certification mark of the Open Source Initiative.
-The license (Mozilla version 1.0) can be read at the MMBase site.
-See http://www.MMBase.org/license
- */
+ The license (Mozilla version 1.0) can be read at the MMBase site.
+ See http://www.MMBase.org/license
+*/
package org.mmbase.applications.crontab.builders;
import org.mmbase.applications.crontab.CronEntry;
@@ -47,7 +47,8 @@
return
org.mmbase.bridge.ContextProvider.getDefaultCloudContext().getCloud("mmbase",
"class", null).getNode(getId());
}
- @Override public String getServers() {
+ @Override
+ public String getServers() {
Node jobNode = getNode();
NodeIterator servers =
jobNode.getRelatedNodes("mmservers").nodeIterator();
@@ -64,7 +65,8 @@
}
- @Override public boolean isActive() {
+ @Override
+ public boolean isActive() {
Node jobNode = getNode();
NodeIterator servers =
jobNode.getRelatedNodes("mmservers").nodeIterator();
if (! servers.hasNext() &&
@@ -87,7 +89,8 @@
return false;
}
- @Override protected void setCronTime(String ct) {
+ @Override
+ protected void setCronTime(String ct) {
String prev = cronTime;
super.setCronTime(ct);
if (prev == null) {
@@ -98,14 +101,16 @@
}
- @Override public void setConfiguration(String conf) {
+ @Override
+ public void setConfiguration(String conf) {
super.setConfiguration(conf);
Node n = getNode();
n.setStringValue("config", conf);
n.commit();
}
- @Override protected void setLastRun(Date d) {
+ @Override
+ protected void setLastRun(Date d) {
super.setLastRun(d);
Node node = getNode();
if (node.getNodeManager().hasField("lastrun")) {
@@ -117,7 +122,8 @@
}
}
- @Override protected void incCount() {
+ @Override
+ protected void incCount() {
super.incCount();
Node node = getNode();
if (node.getNodeManager().hasField("count")) {
@@ -127,7 +133,8 @@
}
}
- @Override protected void setLastCost(int i) {
+ @Override
+ protected void setLastCost(int i) {
super.setLastCost(i);
Node node = getNode();
if (node.getNodeManager().hasField("lastcost")) {
@@ -140,8 +147,23 @@
}
- @Override public String toString() {
+ @Override
+ public String toString() {
return "NODE: " + super.toString();
}
+
+ /**
+ * Two CronEntrys as considered equal if they have the same id, name,
classname and configuration.
+ */
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof NodeCronEntry)) {
+ return false;
+ }
+ CronEntry other = (CronEntry)o;
+ return getId().equals(other.getId());
+ }
+
+
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
