From 9f7901f9d3adb5ef2a52256636f337e2e1341ad0 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 19 Feb 2010 13:47:00 +0000
Subject: [PATCH] Monotone-Parent: be431bdd93e6d75500bc17889aba62d9c2c91105
 Monotone-Revision: 0ebe4e0732b854746e58688103e527d97b43e36e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-19T13:47:00
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog   |  6 ++++++
 Main/SOGo.m | 21 ++++++++++-----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f3a231ba..a67078b15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* Main/SOGo.m (-run): moved initialization logs from +initialize
+	here, so that they are output to the redirected output stream.
+	Added version number to "starting" line.
+
 2010-02-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tools/SOGoToolRestore.m (+initialize): removed method.
diff --git a/Main/SOGo.m b/Main/SOGo.m
index 221a6b7e7..7b175a1d1 100644
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -52,7 +52,6 @@
 #import <SOGo/SOGoProxyAuthenticator.h>
 #import <SOGo/SOGoUserFolder.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoStartupLogger.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoWebAuthenticator.h>
 #import <SOGo/WORequest+SOGo.h>
@@ -82,25 +81,16 @@ static BOOL debugLeaks;
   SOGoSystemDefaults *defaults;
   SoClassSecurityInfo *sInfo;
   NSArray *basicRoles;
-  SOGoStartupLogger *logger;
 
-  logger = [SOGoStartupLogger sharedLogger];
-  [logger logWithFormat: @"starting SOGo (build %@)", SOGoBuildDate];
-  
   defaults = [SOGoSystemDefaults sharedSystemDefaults];
   doCrashOnSessionCreate = [defaults crashOnSessionCreate];
   debugRequests = [defaults debugRequests];
 #ifdef GNUSTEP_BASE_LIBRARY
   debugLeaks = [defaults debugLeaks];
-  if (debugLeaks)
-    [logger logWithFormat: @"activating leak debugging"];
 #endif
-  /* vMem size check - default is 384MB */
 
+  /* vMem size check - default is 384MB */
   vMemSizeLimit = [defaults vmemLimit];
-  if (vMemSizeLimit > 0)
-    [logger logWithFormat: @"vmem size check enabled: shutting down app when "
-            @"vmem > %d MB", vMemSizeLimit];
   
   /* SoClass security declarations */
   sInfo = [self soClassSecurityInfo];
@@ -240,6 +230,15 @@ static BOOL debugLeaks;
 
 - (void) run
 {
+  [self logWithFormat: @"version %d.%d.%d (build %@) -- starting",
+        SOGO_MAJOR_VERSION, SOGO_MINOR_VERSION, SOGO_SUBMINOR_VERSION,
+        SOGoBuildDate];
+  if (debugLeaks)
+    [self logWithFormat: @"activating leak debugging"];
+  if (vMemSizeLimit > 0)
+    [self logWithFormat: @"vmem size check enabled: shutting down app when "
+          @"vmem > %d MB", vMemSizeLimit];
+
   if (!hasCheckedTables)
     {
       hasCheckedTables = YES;