From db48787d30aea3aac3a54576d9c62aa52ab3936a Mon Sep 17 00:00:00 2001 From: znek Date: Tue, 2 May 2006 03:06:26 +0000 Subject: [PATCH] enhanced console logging git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1259 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sopex/SOPEX/CHANGES | 2 +- sopex/SOPEX/ChangeLog | 7 +++++- sopex/SOPEX/SOPEX.xcodeproj/project.pbxproj | 8 +++---- sopex/SOPEX/SOPEXAppController.m | 24 +++++++++++++++++++-- sopex/SOPEX/Version | 2 +- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/sopex/SOPEX/CHANGES b/sopex/SOPEX/CHANGES index 8e828059..70f4929b 100644 --- a/sopex/SOPEX/CHANGES +++ b/sopex/SOPEX/CHANGES @@ -10,7 +10,7 @@ responsible for running NGObjWeb's WORunLoop. Because of this, SNS has been removed from SOPE:X. Also, the SOPEXConsole has been rewritten from using pipes to utilizing a new SOPEXConsoleAppender (and -related formatter). This is limited to NGLogging, however. NGLog() won't +related formatter). This is limited to NGLogging, however. NSLog() won't work in this context - however NGLogging is supposed to be the new standard and is supported throughout SOPE. diff --git a/sopex/SOPEX/ChangeLog b/sopex/SOPEX/ChangeLog index 9824be35..2d7e94ce 100644 --- a/sopex/SOPEX/ChangeLog +++ b/sopex/SOPEX/ChangeLog @@ -1,6 +1,11 @@ +2006-05-02 Marcus Mueller + + * SOPEXAppController.m: added config for WOHttpTransactionLogger - + transactions now properly do appear in the console window (v2.0.9) + 2006-01-27 Marcus Mueller - * v2.0.4 + * v2.0.8 * SOPEXBrowserController.m: added UI delegate methods for creating new browser windows. It's possible now to have multiple targets diff --git a/sopex/SOPEX/SOPEX.xcodeproj/project.pbxproj b/sopex/SOPEX/SOPEX.xcodeproj/project.pbxproj index d8fc4da3..4e0f2c2c 100644 --- a/sopex/SOPEX/SOPEX.xcodeproj/project.pbxproj +++ b/sopex/SOPEX/SOPEX.xcodeproj/project.pbxproj @@ -527,7 +527,7 @@ ); buildSettings = { DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.0.8; + DYLIB_CURRENT_VERSION = 2.0.9; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_ENABLE_TRIGRAPHS = NO; @@ -736,7 +736,7 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.0.8; + DYLIB_CURRENT_VERSION = 2.0.9; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_ENABLE_TRIGRAPHS = NO; @@ -783,7 +783,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = /; DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.0.8; + DYLIB_CURRENT_VERSION = 2.0.9; DYLIB_INSTALL_NAME_BASE = "@executable_path/../Frameworks/"; FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks"; FRAMEWORK_VERSION = A; @@ -840,7 +840,7 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 2.0.0; - DYLIB_CURRENT_VERSION = 2.0.8; + DYLIB_CURRENT_VERSION = 2.0.9; FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks"; FRAMEWORK_VERSION = A; GCC_ENABLE_TRIGRAPHS = NO; diff --git a/sopex/SOPEX/SOPEXAppController.m b/sopex/SOPEX/SOPEXAppController.m index 9e4c4f9f..709d85be 100644 --- a/sopex/SOPEX/SOPEXAppController.m +++ b/sopex/SOPEX/SOPEXAppController.m @@ -159,7 +159,9 @@ static BOOL isInRADMode = YES; } - (void)prepareForLaunch { - NSUserDefaults *ud; + NSUserDefaults *ud; + NSArray *appenders; + NSMutableDictionary *tmp, *fmt; ud = [NSUserDefaults standardUserDefaults]; @@ -168,7 +170,25 @@ static BOOL isInRADMode = YES; [ud setObject:@"SOPEXConsoleAppender" forKey:@"NGLogDefaultAppenderClass"]; [ud setObject:@"SOPEXConsoleEventFormatter" forKey:@"NGLogDefaultLogEventFormatterClass"]; - + + fmt = [[NSMutableDictionary alloc] initWithCapacity:1]; + [fmt setObject:@"SOPEXConsoleEventFormatter" forKey:@"Class"]; + + tmp = [[NSMutableDictionary alloc] initWithCapacity:1]; + [tmp setObject:@"SOPEXConsoleAppender" forKey:@"Class"]; + [tmp setObject:fmt forKey:@"Formatter"]; + [fmt release]; + + appenders = [[NSArray alloc] initWithObjects:tmp, nil]; + [tmp release]; + + tmp = [[NSMutableDictionary alloc] initWithCapacity:2]; + [tmp setObject:@"INFO" forKey:@"LogLevel"]; + [tmp setObject:appenders forKey:@"Appenders"]; + [appenders release]; + [ud setObject:tmp forKey:@"WOHttpTransactionLoggerConfig"]; + [tmp release]; + /* SOPE options */ /* wildcard host and automatic port */ diff --git a/sopex/SOPEX/Version b/sopex/SOPEX/Version index 2637404d..72ba4f54 100644 --- a/sopex/SOPEX/Version +++ b/sopex/SOPEX/Version @@ -7,7 +7,7 @@ MAJOR_VERSION=2 MINOR_VERSION=0 -SUBMINOR_VERSION=8 +SUBMINOR_VERSION=9 # v2.0.0 requires NGObjWeb v4.5.95 # v1.0.7 requires NGObjWeb v4.2.341 -- 2.39.5