--- dao/DaoMqPump2/MQFilter/FilterController.cs	2014/05/19 12:16:44	2176
+++ dao/DaoMqPump2/MQFilter/FilterController.cs	2014/05/19 19:51:47	2177
@@ -24,6 +24,8 @@
 
         public string[] filterTranscations { get; private set; }
 
+        Logfile logFile;
+
 
         public static readonly string queueNameIndbakke = "DAO.INDBAKKE";
         public static readonly string queueNameDimaps = "DAO.SAMLET";
@@ -34,6 +36,8 @@
         protected FilterController()
         {
             initialize();
+            logFile = new Logfile(LogfileType.LogEvents, "filter", logDirectory);
+            logFile.addSingleLogEntry("Starting service");
         }
 
         private void initialize()
@@ -101,9 +105,20 @@
 
 
 
-
         public void transportAllMessages()
         {
+            try
+            {
+                transportMessagesWorker();
+            }
+            catch (Exception e)
+            {
+                logFile.addSingleLogEntry("Error during transportAllMessages: " + e.Message);
+            }
+        }
+
+        private void transportMessagesWorker()
+        {
             int messageCount = 0;
 
             MQQueueManager mqMgr = null;
@@ -111,6 +126,8 @@
             MQQueue queueMysql = null;
             MQQueue queueDimaps = null;
             MQQueue queueStore = null;
+
+            using (Logfile translog = new Logfile(LogfileType.LogTransactions, "filter", logDirectory))
             try
             {
                 //MQ options
@@ -150,14 +167,17 @@
                             // validér at headeren er gyldig
                             if ( Salt2Helper.validateSalt2Header(salt2String) == false)
                             {
-                                string discarded_filename = Logfile.getLogFilename(LogfileType.LogTransactions, logDirectory, "filter");
-                                using (StreamWriter discardedlog = new StreamWriter(discarded_filename, true))
+
+
+                                using (Logfile discardedlog = new Logfile(LogfileType.LogDiscarded, "filter", logDirectory))
                                 {
-                                    discardedlog.WriteLine(Logfile.getNowString() + " " + salt2String);
+                                    discardedlog.writeLogEntry(salt2String);
                                 }
                                 continue; //gå frem til at tage næste transaktion fra køen
                             }
 
+                            translog.writeLogEntry(salt2String);
+
                             MQPutMessageOptions pmo = new MQPutMessageOptions(); // accept the defaults,
                             // same as MQPMO_DEFAULT
 
@@ -177,7 +197,7 @@
                                 queueDimaps.Put(msg, pmo);
                             }
 
-
+                            
 
                             messageCount++;// increment per run message counter
                             if (messageCount >= 10000) // if we have moved  10000 messages in this run - let it go