diff --git a/ChangeLog b/ChangeLog index 6f3a231ba..a67078b15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-02-19 Wolfgang Sourdeau + + * 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 * 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 #import #import -#import #import #import #import @@ -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;