LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reaktivieren des background tasks in p2fs, der in r273 versehentlich deaktiviert wurde. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@303 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2009-11-15 10:23:23 +00:00
parent db30d9a58a
commit 037b0b4675
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ccm-cms/src/com/arsdigita/cms/publishToFile/Initializer.java
View File

@ -206,7 +206,7 @@ public class Initializer implements com.arsdigita.initializer.Initializer {
// start thread for monitoring queue // start thread for monitoring queue
int startupDelay = getInteger(QUEUE_POLL_STARTUP_DELAY).intValue(); int startupDelay = getInteger(QUEUE_POLL_STARTUP_DELAY).intValue();
int pollDelay = getInteger(QUEUE_POLL_DELAY).intValue(); int pollDelay = getInteger(QUEUE_POLL_DELAY).intValue();
// QueueManager.startWatchingQueue(startupDelay, pollDelay); QueueManager.startWatchingQueue(startupDelay, pollDelay);
} }
// //
@ -272,7 +272,7 @@ public class Initializer implements com.arsdigita.initializer.Initializer {
"' must not end with a '/'"); "' must not end with a '/'");
} }
// Does destRoot really now turns into an absolute fully pathname?! // Does destRoot really now turns into an absolute fully pathname
destRoot = new File(CCMResourceManager.getBaseDirectory().getPath(), destRoot = new File(CCMResourceManager.getBaseDirectory().getPath(),
destRoot).getPath(); destRoot).getPath();
s_log.info("Destination Root is set to : " + destRoot); s_log.info("Destination Root is set to : " + destRoot);
@ -321,7 +321,7 @@ public class Initializer implements com.arsdigita.initializer.Initializer {
fl.close(); fl.close();
} catch ( IOException e ) { } catch ( IOException e ) {
// Will be reported as an initalization error // Will be reported as an initalization error
s_log.warn("Fehler beim Erstellen der Datei " + fname.getPath()); s_log.warn("Error creating file " + fname.getPath());
} }

9
ccm-cms/src/com/arsdigita/cms/publishToFile/QueueManager.java
View File

@ -432,6 +432,9 @@ public class QueueManager implements Runnable {
*/ */
public static void startWatchingQueue(int startupDelay, int pollDelay) { public static void startWatchingQueue(int startupDelay, int pollDelay) {
if ( startupDelay > 0 ) { if ( startupDelay > 0 ) {
if (s_log.isInfoEnabled()) {
s_log.info("Going to start queue processing.");
}
s_queueThread = new Thread( new QueueManager(startupDelay, pollDelay) ); s_queueThread = new Thread( new QueueManager(startupDelay, pollDelay) );
s_queueThread.setDaemon(true); s_queueThread.setDaemon(true);
s_queueThread.setName("cms-p2fs-queue"); s_queueThread.setName("cms-p2fs-queue");
@ -442,9 +445,9 @@ public class QueueManager implements Runnable {
/** /**
* Stop watching and processing the queue. The background thread that * Stop watching and processing the queue. The background thread that
* processes the queue will terminate after this method has been * processes the queue will terminate after this method has been called.
* called. Termination is not immediate, since the queue may be in the * Termination is not immediate, since the queue may be in the middle of
* middle of processing a block of entries. * processing a block of entries.
*/ */
public static void stopWatchingQueue() { public static void stopWatchingQueue() {
if (s_log.isInfoEnabled()) { if (s_log.isInfoEnabled()) {