LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: be431bdd93e6d75500bc17889aba62d9c2c91105 

Monotone-Revision: 0ebe4e0732b854746e58688103e527d97b43e36e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-19T13:47:00
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-02-19 13:47:00 +00:00
parent 93a566cf9b
commit 9f7901f9d3
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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.

21
Main/SOGo.m
View File

@ -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;