mirror of
https://github.com/gnustep/libs-gsweb.git
synced 2025-04-23 15:33:43 +00:00
* GSWeb.framework/GSWApplication.h
([GSWApplication _handleException:inContext:]): Remove obsolete declaration. * GSWeb.framework/GSWApplication.m: Added GSWAppClassDummy class declarations to avoid compiler warnings genrerated for messages sent to 'Class'. ([NSDistantObject setDebug:]): Added declaration to avoid compiler warning. ([GSWApplication init]): Use GSWAppClassDummy to avoid compiler warnings. ([GSWApplication _argsDictionaryWithUserDefaults:]): Ditto. ([GSWApplication _monitorApplicationName]): Ditto. ([GSWApplication _connectionDidDie:]): Translated comment to allow ascii encoding. ([GSWApplication _remoteMonitor]): Test whether NSDistantObject responds to setDebug: before dispatching the method. Use performSelector: to send undeclared targetForProxy method. ([GSWApplication monitoringEnabled]): Forward isMonitorEnabled to class. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18431 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers
parent
6d07617232
commit
f7995b48a2
3 changed files with 60 additions and 18 deletions
22
ChangeLog
22
ChangeLog
|
|
@ -1,3 +1,25 @@
|
|||
2004-01-18 David Ayers <d.ayers@inode.at>
|
||||
|
||||
* GSWeb.framework/GSWApplication.h
|
||||
([GSWApplication _handleException:inContext:]): Remove obsolete
|
||||
declaration.
|
||||
* GSWeb.framework/GSWApplication.m: Added GSWAppClassDummy class
|
||||
declarations to avoid compiler warnings genrerated for messages
|
||||
sent to 'Class'.
|
||||
([NSDistantObject setDebug:]): Added declaration to avoid compiler
|
||||
warning.
|
||||
([GSWApplication init]): Use GSWAppClassDummy to avoid compiler
|
||||
warnings.
|
||||
([GSWApplication _argsDictionaryWithUserDefaults:]): Ditto.
|
||||
([GSWApplication _monitorApplicationName]): Ditto.
|
||||
([GSWApplication _connectionDidDie:]): Translated comment to allow
|
||||
ascii encoding.
|
||||
([GSWApplication _remoteMonitor]): Test whether NSDistantObject
|
||||
responds to setDebug: before dispatching the method. Use
|
||||
performSelector: to send undeclared targetForProxy method.
|
||||
([GSWApplication monitoringEnabled]): Forward isMonitorEnabled to
|
||||
class.
|
||||
|
||||
2004-01-13 David Ayers <d.ayers@inode.at>
|
||||
|
||||
* config/pathxml.m4: Whitespace fixes for coding standards.
|
||||
|
|
|
|||
|
|
@ -358,8 +358,6 @@ extern BOOL WOStrictFlag;
|
|||
@interface GSWApplication (GSWErrorHandling)
|
||||
-(GSWResponse*)handleException:(NSException*)exception
|
||||
inContext:(GSWContext*)aContext;
|
||||
-(GSWResponse*)_handleException:(NSException*)exception
|
||||
inContext:(GSWContext*)aContext;
|
||||
-(GSWResponse*)handlePageRestorationErrorInContext:(GSWContext*)aContext;
|
||||
-(GSWResponse*)_handlePageRestorationErrorInContext:(GSWContext*)aContext;
|
||||
-(GSWResponse*)handleSessionCreationErrorInContext:(GSWContext*)aContext;
|
||||
|
|
|
|||
|
|
@ -54,6 +54,24 @@ application unlock
|
|||
|
||||
*/
|
||||
|
||||
/*
|
||||
The following class does not exist. The declaration is merely used
|
||||
to aid the compiler to find the correct signatures for messages
|
||||
sent to the class and to avoid polluting the compiler output with
|
||||
superfluous warnings.
|
||||
*/
|
||||
@interface GSWAppClassDummy : NSObject
|
||||
- (NSString *)adaptor;
|
||||
- (NSString *)host;
|
||||
- (NSNumber *)port;
|
||||
@end
|
||||
|
||||
#ifdef GNUSTEP
|
||||
@interface NSDistantObject (GNUstepPrivate)
|
||||
+ (void) setDebug: (int)val;
|
||||
@end
|
||||
#endif
|
||||
|
||||
@interface GSWApplication (GSWApplicationPrivate)
|
||||
- (void)_setPool:(NSAutoreleasePool *)pool;
|
||||
@end
|
||||
|
|
@ -801,14 +819,15 @@ int GSWApplicationMain(NSString* applicationClassName,
|
|||
if (lifebeatInterval<1)
|
||||
lifebeatInterval=30; //30s
|
||||
NSDebugMLLog(@"application",@"lifebeatInterval=%f",lifebeatInterval);
|
||||
|
||||
ASSIGN(_lifebeatThread,[GSWLifebeatThread lifebeatThreadWithApplication:self
|
||||
name:[self name]
|
||||
host:[[self class] host]
|
||||
port:[[self class] intPort]
|
||||
lifebeatHost:[[self class]lifebeatDestinationHost]
|
||||
lifebeatPort:[[self class]lifebeatDestinationPort]
|
||||
interval:lifebeatInterval]);
|
||||
|
||||
ASSIGN(_lifebeatThread,
|
||||
[GSWLifebeatThread lifebeatThreadWithApplication:self
|
||||
name:[self name]
|
||||
host:[(GSWAppClassDummy*)[self class] host]
|
||||
port:[[self class] intPort]
|
||||
lifebeatHost:[[self class] lifebeatDestinationHost]
|
||||
lifebeatPort:[[self class] lifebeatDestinationPort]
|
||||
interval:lifebeatInterval]);
|
||||
NSDebugMLLog(@"application",@"_lifebeatThread=%@",_lifebeatThread);
|
||||
#warning go only multi-thread if we want this!
|
||||
|
||||
|
|
@ -1347,9 +1366,9 @@ selfLockn,
|
|||
NSNumber* listenQueueSize=nil;
|
||||
NSMutableDictionary* argsDict=nil;
|
||||
LOGObjectFnStart();
|
||||
port=[[self class] port];
|
||||
host=[[self class] host];
|
||||
adaptor=(NSString*)[[self class] adaptor];
|
||||
port=[(GSWAppClassDummy*)[self class] port];
|
||||
host=[(GSWAppClassDummy*)[self class] host];
|
||||
adaptor=[(GSWAppClassDummy*)[self class] adaptor];
|
||||
workerThreadCount=[[self class] workerThreadCount];
|
||||
listenQueueSize=[[self class] listenQueueSize];
|
||||
argsDict=(NSMutableDictionary*)[NSMutableDictionary dictionary];
|
||||
|
|
@ -2175,7 +2194,7 @@ to another instance **/
|
|||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
//appellé quand le moteur est fermé
|
||||
//called when deamon is shutdown
|
||||
-(void)_connectionDidDie:(id)unknown
|
||||
{
|
||||
LOGObjectFnNotImplemented(); //TODOFN
|
||||
|
|
@ -2227,11 +2246,14 @@ to another instance **/
|
|||
id proxy=nil;
|
||||
NSDebugFLLog(@"monitor",@"monitorHost=%@",monitorHost);
|
||||
NSDebugFLLog(@"monitor",@"workerThreadCount=%@",workerThreadCount);
|
||||
[NSDistantObject setDebug:YES];
|
||||
if ([[NSDistantObject class] respondsToSelector:@selector(setDebug:)])
|
||||
{
|
||||
[NSDistantObject setDebug:YES];
|
||||
}
|
||||
_remoteMonitorConnection = [NSConnection connectionWithRegisteredName:GSWMonitorServiceName
|
||||
host:monitorHost];
|
||||
proxy=[_remoteMonitorConnection rootProxy];
|
||||
_remoteMonitor=[proxy targetForProxy];
|
||||
_remoteMonitor=[proxy performSelector:@selector(targetForProxy)];
|
||||
[self _synchronizeInstanceSettingsWithMonitor:_remoteMonitor];
|
||||
};
|
||||
LOGObjectFnStop();
|
||||
|
|
@ -2248,7 +2270,7 @@ to another instance **/
|
|||
-(NSString*)_monitorApplicationName
|
||||
{
|
||||
NSString* name=[self name];
|
||||
NSNumber* port=[[self class]port];
|
||||
NSNumber* port=[(GSWAppClassDummy*)[self class] port];
|
||||
NSString* monitorApplicationName=[NSString stringWithFormat:@"%@-%@",
|
||||
name,
|
||||
port];
|
||||
|
|
@ -4176,7 +4198,7 @@ to another instance **/
|
|||
//monitoringEnabled [deprecated]
|
||||
-(BOOL)monitoringEnabled
|
||||
{
|
||||
return [self isMonitorEnabled];
|
||||
return [[self class] isMonitorEnabled];
|
||||
};
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue