logging is now done more appropriately... still waiting for idefix' introduction...

diff --git a/source/config.properties-dist b/source/config.properties-dist
index 66534e4..f52effe 100755 (executable)
--- a/source/config.properties-dist
+++ b/source/config.properties-dist
@@ -40,6 +40,8 @@ ClearXslCache=no
 StandardLanguage=de
 DirectOpenposting=yes
 
+Mir.Localizer.Logfile=log/localizer.log
+
 #note that you can't make pdf's without making fo's
 GenerateFO=yes
 GeneratePDF=yes

diff --git a/source/mircoders/global/ProducerEngine.java b/source/mircoders/global/ProducerEngine.java
index 9321649..55c4944 100755 (executable)
--- a/source/mircoders/global/ProducerEngine.java
+++ b/source/mircoders/global/ProducerEngine.java
@@ -17,10 +17,11 @@ public class ProducerEngine {
     producers = MirGlobal.localizer().producers().factories();
     producerJobQueue = new JobQueue();
     try {
-      log = new PrintWriter(new FileWriter(new File("/tmp/producer.log")));
+               log = new PrintWriter(new FileWriter( (new RandomAccessFile(MirGlobal.getConfigProperty("Home") + "/" + MirGlobal.getConfigProperty("Producer.Logfile"), "rw")).getFD()));
     }
     catch (Exception e) {
-      throw new ProducerEngineRuntimeExc("Creating PrintWriter log failed",e);
+//      throw new ProducerEngineRuntimeExc("Creating PrintWriter log failed",e);
+      log = new PrintWriter(new NullWriter());
     }
     queueThread = new Thread(new ProducerJobQueueThread());
     queueThread.start();

diff --git a/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java b/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java
index 6cde527..9958c63 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicGeneratorLocalizer.java
@@ -1,9 +1,12 @@
 package mircoders.localizer.basic;
 
 import freemarker.template.*;
+import mir.misc.*;
 import mircoders.localizer.*;
+import mircoders.global.*;
 
 public class MirBasicGeneratorLocalizer extends FreemarkerGeneratorLocalizer {
+  protected static Logfile logger = Logfile.getInstance( MirGlobal.getConfigProperty("Home") + "/" + MirGlobal.getConfigProperty("Mir.Localizer.Logfile"));
 
   public MirBasicGeneratorLocalizer (String aTemplateRoot) {
     super(aTemplateRoot);

diff --git a/source/mircoders/localizer/basic/MirBasicLocalizer.java b/source/mircoders/localizer/basic/MirBasicLocalizer.java
index 9e9acab..a0a15f4 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicLocalizer.java
@@ -1,9 +1,11 @@
 package mircoders.localizer.basic;
 
-import mircoders.localizer.*;
+import mir.misc.*;
 import mircoders.global.*;
+import mircoders.localizer.*;
 
 public class MirBasicLocalizer implements MirLocalizer {
+  protected static Logfile logger = Logfile.getInstance( MirGlobal.getConfigProperty("Home") + "/" + MirGlobal.getConfigProperty("Mir.Localizer.Logfile"));
 
   public MirProducerLocalizer producers() {
     return new MirBasicProducerLocalizer();

diff --git a/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java b/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java
index a487b02..d48a7e9 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicOpenPostingLocalizer.java
@@ -3,10 +3,12 @@ package mircoders.localizer.basic;
 import java.util.*;
 import javax.servlet.http.*;
 
-import mircoders.localizer.*;
+import mir.misc.*;
 import mircoders.global.*;
+import mircoders.localizer.*;
 
 public class MirBasicOpenPostingLocalizer implements MirOpenPostingLocalizer {
+  protected static Logfile logger = Logfile.getInstance( MirGlobal.getConfigProperty("Home") + "/" + MirGlobal.getConfigProperty("Mir.Localizer.Logfile"));
 
   public void afterContentPosting() {
     MirGlobal.producerEngine().addJob("content", "new");

diff --git a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
index 9e60273..621b026 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicProducerLocalizer.java
@@ -2,12 +2,14 @@ package mircoders.localizer.basic;
 
 import java.util.*;
 import mir.producer.*;
+import mir.misc.*;
 import mircoders.global.*;
 import mircoders.localizer.*;
 import mircoders.producer.*;
 
 public class MirBasicProducerLocalizer implements MirProducerLocalizer {
   private Map producerFactories;
+  protected static Logfile logger = Logfile.getInstance( MirGlobal.getConfigProperty("Home") + "/" + MirGlobal.getConfigProperty("Mir.Localizer.Logfile"));
 
   public MirBasicProducerLocalizer() {
     producerFactories = new HashMap();
@@ -26,7 +28,7 @@ public class MirBasicProducerLocalizer implements MirProducerLocalizer {
   }
 
   protected void setupSynchronizationFactory(CompositeProducerNode aProducerNode) {
-                         if(MirGlobal.getConfigBooleanProperty("Rsync")){
+    if(MirGlobal.getConfigBooleanProperty("Rsync")){
       aProducerNode.addSubNode(
         new ScriptCallingProducerNode(MirGlobal.getConfigProperty("Rsync.Script.Path"))
       );

diff --git a/source/mircoders/localizer/basic/MirBasicProducerToolLocalizer.java b/source/mircoders/localizer/basic/MirBasicProducerToolLocalizer.java
index 86a7d73..f08d21a 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicProducerToolLocalizer.java
+++ b/source/mircoders/localizer/basic/MirBasicProducerToolLocalizer.java
@@ -11,6 +11,7 @@ import mircoders.localizer.*;
 import mircoders.global.*;
 
 public class MirBasicProducerToolLocalizer implements MirProducerToolLocalizer {
+  protected static Logfile logger = Logfile.getInstance( MirGlobal.getConfigProperty("Home") + "/" + MirGlobal.getConfigProperty("Mir.Localizer.Logfile"));
 
   public void initializeGenerationValueSet(Map aValueSet) {
     // ML: these config settings will be included more beautifully as soon as the new config system is in place
@@ -49,8 +50,7 @@ public class MirBasicProducerToolLocalizer implements MirProducerToolLocalizer {
       languageList = languageModule.getByWhereClause("", "id", -1);
     }
     catch (Throwable t) {
-      System.out.println("initializeGenerationValueSet: Exception "+t.getMessage());
-      t.printStackTrace(System.out);
+      logger.printError("initializeGenerationValueSet: Exception "+t.getMessage());
     }
 
     aValueSet.put("topics", topicList);

diff --git a/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java b/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
index 4d19603..7bf726a 100755 (executable)
--- a/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
+++ b/source/mirlocal/euskalherria.indymedia.org/EHProducerLocalizer.java
@@ -39,6 +39,7 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
           );
     }
     catch (Throwable t) {
+      logger.printError("EHProducerLocalizer.setupContentFactory: Exception "+t.getMessage());
     }
 
     contentNode.addVerb( "all", "is_published='1'", "" );
@@ -78,13 +79,7 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
       );
     }
     catch (Throwable t) {
-      try {
-        PrintWriter log = new PrintWriter(new FileWriter(new File("/tmp/errorbla.log")));
-        log.println(t.getMessage());
-        t.printStackTrace(log);
-      }
-      catch (Throwable q) {
-      }
+      logger.printError("EHProducerLocalizer.setupStartPageFactory: Exception "+t.getMessage());
     }
   }
 
@@ -107,6 +102,7 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
       );
     }
     catch (Throwable t) {
+      logger.printError("EHProducerLocalizer.setupStaticFactory: Exception "+t.getMessage());
     }
   }
 
@@ -158,6 +154,7 @@ public class EHProducerLocalizer extends MirBasicProducerLocalizer {
       );
     }
     catch (Throwable t) {
+      logger.printError("EHProducerLocalizer.setupTopicsFactory: Exception "+t.getMessage());
     }
 
   }

diff --git a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
index 106e372..3a5de34 100755 (executable)
--- a/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
+++ b/source/mirlocal/indymedia.nl/IndyNLProducerLocalizer.java
@@ -40,6 +40,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
           );
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupContentFactory: Exception "+t.getMessage());
     }
 
     contentNode.addVerb( "all", "is_published='1'", "" );
@@ -92,6 +93,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       );
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupStartPageFactory: Exception "+t.getMessage());
     }
   }
 
@@ -138,6 +140,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       );
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupTopicsFactory Exception "+t.getMessage());
     }
   }
 
@@ -209,6 +212,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
       );
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupStaticFactory Exception "+t.getMessage());
     }
   }
 
@@ -238,6 +242,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
           );
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories Exception "+t.getMessage());
     }
 
     aFactoriesMap.put("features", new NodedProducerFactory( node ) );
@@ -263,6 +268,7 @@ public class IndyNLProducerLocalizer extends MirBasicProducerLocalizer {
           );
     }
     catch (Throwable t) {
+      logger.printError("IndyNLProducerLocalizer.setupFactories Exception "+t.getMessage());
     }
     aFactoriesMap.put("featurestest", new NodedProducerFactory( node ) );
   }