You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/11/04 01:30:32 UTC
svn commit: r471077 - in
/incubator/roller/branches/roller_3.1/src/org/apache/roller:
business/hibernate/HibernateThreadManagerImpl.java
business/search/operations/WriteToIndexOperation.java
planet/business/hibernate/HibernatePlanetManagerImpl.java
Author: agilliland
Date: Fri Nov 3 16:30:31 2006
New Revision: 471077
URL: http://svn.apache.org/viewvc?view=rev&rev=471077
Log:
merging changes from trunk between revisions 470627 and 471074 which includes these changes ...
- updated logging level on part of planet manager refreshEntries method
- updated logging level on WriteToIndexOperation
- fixed bug in date calculation for getNextRun() in thread manager impl
Modified:
incubator/roller/branches/roller_3.1/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java
incubator/roller/branches/roller_3.1/src/org/apache/roller/business/search/operations/WriteToIndexOperation.java
incubator/roller/branches/roller_3.1/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
Modified: incubator/roller/branches/roller_3.1/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java?view=diff&rev=471077&r1=471076&r2=471077
==============================================================================
--- incubator/roller/branches/roller_3.1/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java (original)
+++ incubator/roller/branches/roller_3.1/src/org/apache/roller/business/hibernate/HibernateThreadManagerImpl.java Fri Nov 3 16:30:31 2006
@@ -190,7 +190,7 @@
// calculate next run time
Calendar cal = Calendar.getInstance();
cal.setTime(lastRun);
- cal.add(Calendar.SECOND, task.getInterval());
+ cal.add(Calendar.MINUTE, task.getInterval());
return cal.getTime();
}
Modified: incubator/roller/branches/roller_3.1/src/org/apache/roller/business/search/operations/WriteToIndexOperation.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/src/org/apache/roller/business/search/operations/WriteToIndexOperation.java?view=diff&rev=471077&r1=471076&r2=471077
==============================================================================
--- incubator/roller/branches/roller_3.1/src/org/apache/roller/business/search/operations/WriteToIndexOperation.java (original)
+++ incubator/roller/branches/roller_3.1/src/org/apache/roller/business/search/operations/WriteToIndexOperation.java Fri Nov 3 16:30:31 2006
@@ -38,9 +38,9 @@
public void run() {
try {
manager.getReadWriteLock().writeLock().acquire();
- mLogger.info("Starting search index operation");
+ mLogger.debug("Starting search index operation");
doRun();
- mLogger.info("Search index operation complete");
+ mLogger.debug("Search index operation complete");
} catch (InterruptedException e) {
mLogger.error("Error acquiring write lock on index", e);
} finally {
Modified: incubator/roller/branches/roller_3.1/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.1/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java?view=diff&rev=471077&r1=471076&r2=471077
==============================================================================
--- incubator/roller/branches/roller_3.1/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java (original)
+++ incubator/roller/branches/roller_3.1/src/org/apache/roller/planet/business/hibernate/HibernatePlanetManagerImpl.java Fri Nov 3 16:30:31 2006
@@ -432,7 +432,7 @@
this.strategy.flush();
}
long subEndTime = System.currentTimeMillis();
- log.info(" " + count + " - "
+ log.debug(" " + count + " - "
+ ((subEndTime-subStartTime)/1000.0)
+ " seconds to process (" + count + ") entries of "
+ sub.getFeedURL());