From 037b0b46756148c42d83f620abef49325f1a8073 Mon Sep 17 00:00:00 2001
From: pb <pb@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sun, 15 Nov 2009 10:23:23 +0000
Subject: [PATCH] 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
---
 .../src/com/arsdigita/cms/publishToFile/Initializer.java | 6 +++---
 .../com/arsdigita/cms/publishToFile/QueueManager.java    | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ccm-cms/src/com/arsdigita/cms/publishToFile/Initializer.java b/ccm-cms/src/com/arsdigita/cms/publishToFile/Initializer.java
index b59e1a88e..e7f38de64 100755
--- a/ccm-cms/src/com/arsdigita/cms/publishToFile/Initializer.java
+++ b/ccm-cms/src/com/arsdigita/cms/publishToFile/Initializer.java
@@ -206,7 +206,7 @@ public class Initializer implements com.arsdigita.initializer.Initializer {
         // start thread for monitoring queue
         int startupDelay = getInteger(QUEUE_POLL_STARTUP_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 '/'");
         }
 
-        // 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).getPath();
         s_log.info("Destination Root is set to : " + destRoot);
@@ -321,7 +321,7 @@ public class Initializer implements com.arsdigita.initializer.Initializer {
                 fl.close();
             } catch ( IOException e ) {
                 // 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());
             }
 
  
diff --git a/ccm-cms/src/com/arsdigita/cms/publishToFile/QueueManager.java b/ccm-cms/src/com/arsdigita/cms/publishToFile/QueueManager.java
index 5c0897c8f..eade5b186 100755
--- a/ccm-cms/src/com/arsdigita/cms/publishToFile/QueueManager.java
+++ b/ccm-cms/src/com/arsdigita/cms/publishToFile/QueueManager.java
@@ -432,6 +432,9 @@ public class QueueManager implements Runnable {
      */
     public static void startWatchingQueue(int startupDelay, int pollDelay) {
         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.setDaemon(true);
             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
-     * processes the queue will terminate after this method has been
-     * called. Termination is not immediate, since the queue may be in the
-     * middle of processing a block of entries.
+     * processes the queue will terminate after this method has been called.
+     * Termination is not immediate, since the queue may be in the middle of
+     * processing a block of entries.
      */
     public static void stopWatchingQueue() {
         if (s_log.isInfoEnabled()) {