default to use watch dog

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@113 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 93b6de515d4f841bcd9c9a8494d70848474a7b5e..a155f43ee86da3ed696902b7ea896a9e86010ebe 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-06  Helge Hess  <helge.hess@skyrix.com>
+
+       * Defaults.plist: enable watch dog per default (use WOUseWatchDog
+         default to disable the watch dog) (v4.3.27)
+
 2004-09-06  Helge Hess  <helge.hess@opengroupware.org>
 
        * WOResourceManager.m: minor code cleanups (v4.3.26)

diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index d147d54ee36af43c6388baa79fc48363eb754125..03bdd30f7e66ba0c5523794990dd1b23a1a3245c 100644 (file)
--- 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 28cce4e0cd40481a6ce73b500fa65adcfbb1209e..c1a33f9c559eb4f9145002ecf758ef95d183ffb4 100644 (file)
--- 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 */
   {