inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FeedGenerator doesn't run when system is in read-only mode

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32274 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2011-11-24 12:51:57 +00:00
parent f526d05094
commit 69623f9978
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml
View File

@@ -64,6 +64,7 @@
<property name="maxItemsPerCycle" value="100"/> <property name="maxItemsPerCycle" value="100"/>
<property name="activityPostServiceImpl" ref="activityPostService"/> <property name="activityPostServiceImpl" ref="activityPostService"/>
<property name="jobLockService" ref="jobLockService"/> <property name="jobLockService" ref="jobLockService"/>
<property name="transactionService" ref="transactionService"/>
</bean> </bean>

19
source/java/org/alfresco/repo/activities/feed/AbstractFeedGenerator.java
View File

@@ -26,6 +26,7 @@ import org.alfresco.repo.lock.JobLockService.JobLockRefreshCallback;
import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.namespace.NamespaceService; import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.PropertyCheck; import org.alfresco.util.PropertyCheck;
import org.alfresco.util.VmShutdownListener; import org.alfresco.util.VmShutdownListener;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@@ -52,7 +53,7 @@ public abstract class AbstractFeedGenerator implements FeedGenerator
private ActivityPostDAO postDAO; private ActivityPostDAO postDAO;
private ActivityPostServiceImpl activityPostServiceImpl; private ActivityPostServiceImpl activityPostServiceImpl;
private AuthenticationService authenticationService; private AuthenticationService authenticationService;
private TransactionService transactionService;
private JobLockService jobLockService; private JobLockService jobLockService;
private String repoEndPoint; // http://hostname:port/webapp (eg. http://localhost:8080/alfresco) private String repoEndPoint; // http://hostname:port/webapp (eg. http://localhost:8080/alfresco)
@@ -112,8 +113,12 @@ public abstract class AbstractFeedGenerator implements FeedGenerator
{ {
this.jobLockService = jobLockService; this.jobLockService = jobLockService;
} }
public void setTransactionService(TransactionService transactionService)
{
this.transactionService = transactionService;
}
public RepoCtx getWebScriptsCtx() public RepoCtx getWebScriptsCtx()
{ {
return this.ctx; return this.ctx;
@@ -148,6 +153,16 @@ public abstract class AbstractFeedGenerator implements FeedGenerator
{ {
checkProperties(); checkProperties();
// Avoid running when in read-only mode
if (!transactionService.getAllowWrite())
{
if (logger.isTraceEnabled())
{
logger.trace("Activities feed generator not running due to read-only server");
}
return;
}
String lockToken = null; String lockToken = null;
try try