From 251d04d5b66ac28f22d3abc6a5506d237860cf8c Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 6 Sep 2004 16:29:08 +0000 Subject: [PATCH] default to use watch dog git-svn-id: http://svn.opengroupware.org/SOPE/trunk@113 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 +++++ sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/WOWatchDogApplicationMain.m | 8 ++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 93b6de51..a155f43e 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2004-09-06 Helge Hess + + * Defaults.plist: enable watch dog per default (use WOUseWatchDog + default to disable the watch dog) (v4.3.27) + 2004-09-06 Helge Hess * WOResourceManager.m: minor code cleanups (v4.3.26) diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index d147d54e..03bdd30f 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=26 +SUBMINOR_VERSION:=27 # v4.2.413 requires libSaxObjC v4.2.33 # v4.2.341 requires libNGExtensions v4.2.77 diff --git a/sope-appserver/NGObjWeb/WOWatchDogApplicationMain.m b/sope-appserver/NGObjWeb/WOWatchDogApplicationMain.m index 28cce4e0..c1a33f9c 100644 --- a/sope-appserver/NGObjWeb/WOWatchDogApplicationMain.m +++ b/sope-appserver/NGObjWeb/WOWatchDogApplicationMain.m @@ -247,8 +247,12 @@ int WOWatchDogApplicationMain ud = [NSUserDefaults standardUserDefaults]; - if (![ud boolForKey:@"WOUseWatchDog"]) - return WOApplicationMain(appName, argc, argv); + /* default is to use the watch dog! */ + /* Note: the Defaults.plist is not yet loaded at this stage! */ + if ([ud objectForKey:@"WOUseWatchDog"] != nil) { + if (![ud boolForKey:@"WOUseWatchDog"]) + return WOApplicationMain(appName, argc, argv); + } /* watch dog */ { -- 2.39.5