Item313: add guesses to log file paths

git-svn-id: http://svn.foswiki.org/trunk@975 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 26, 2008 · b1b9d4a · b1b9d4a
1 parent ca7d584
commit b1b9d4a
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 24 deletions.
diff --git a/core/lib/Foswiki/Configure/Checkers/ConfigurationLogName.pm b/core/lib/Foswiki/Configure/Checkers/ConfigurationLogName.pm
@@ -11,12 +11,21 @@ use Foswiki::Configure::Load;
 sub check {
     my $this = shift;
 
-    my $logFile = $Foswiki::cfg{ConfigurationLogName} || "";
-    $logFile =~ s/%DATE%/DATE/;
-    Foswiki::Configure::Load::expandValue($logFile);
-    my $e = $this->checkCanCreateFile($logFile);
-    $e = $this->ERROR($e) if $e;
-    return $e;
+    if (   $Foswiki::cfg{ConfigurationLogName}
+        && $Foswiki::cfg{ConfigurationLogName}!~/^NOT SET/ )
+    {
+        my $logFile = $Foswiki::cfg{ConfigurationLogName} || "";
+        $logFile =~ s/%DATE%/DATE/;
+        Foswiki::Configure::Load::expandValue($logFile);
+        my $e = $this->checkCanCreateFile($logFile);
+        $e = $this->ERROR($e) if $e;
+        return $e;
+    }
+    else {
+        $Foswiki::cfg{ConfigurationLogName} =~ s/^NOT SET/$Foswiki::cfg{DataDir}/g;
+        return $this->guessed(0);
+    }
+    return '';
 }
 
 1;

diff --git a/core/lib/Foswiki/Configure/Checkers/DebugFileName.pm b/core/lib/Foswiki/Configure/Checkers/DebugFileName.pm
@@ -11,12 +11,21 @@ use Foswiki::Configure::Load;
 sub check {
     my $this = shift;
 
-    my $logFile = $Foswiki::cfg{DebugFileName} || "";
-    $logFile =~ s/%DATE%/DATE/;
-    Foswiki::Configure::Load::expandValue($logFile);
-    my $e = $this->checkCanCreateFile($logFile);
-    $e = $this->ERROR($e) if $e;
-    return $e;
+    if (   $Foswiki::cfg{DebugFileName}
+        && $Foswiki::cfg{DebugFileName}!~/^NOT SET/ )
+    {
+        my $logFile = $Foswiki::cfg{DebugFileName} || "";
+        $logFile =~ s/%DATE%/DATE/;
+        Foswiki::Configure::Load::expandValue($logFile);
+        my $e = $this->checkCanCreateFile($logFile);
+        $e = $this->ERROR($e) if $e;
+        return $e;
+    }
+    else {
+        $Foswiki::cfg{DebugFileName} =~ s/^NOT SET/$Foswiki::cfg{DataDir}/g;
+        return $this->guessed(0);
+    }
+    return '';
 }
 
 1;

diff --git a/core/lib/Foswiki/Configure/Checkers/LogFileName.pm b/core/lib/Foswiki/Configure/Checkers/LogFileName.pm
@@ -11,12 +11,21 @@ use Foswiki::Configure::Load;
 sub check {
     my $this = shift;
 
-    my $logFile = $Foswiki::cfg{LogFileName} || "";
-    $logFile =~ s/%DATE%/DATE/;
-    Foswiki::Configure::Load::expandValue($logFile);
-    my $e = $this->checkCanCreateFile($logFile);
-    $e = $this->ERROR($e) if $e;
-    return $e;
+    if (   $Foswiki::cfg{LogFileName}
+        && $Foswiki::cfg{LogFileName}!~/^NOT SET/ )
+    {
+        my $logFile = $Foswiki::cfg{LogFileName} || "";
+        $logFile =~ s/%DATE%/DATE/;
+        Foswiki::Configure::Load::expandValue($logFile);
+        my $e = $this->checkCanCreateFile($logFile);
+        $e = $this->ERROR($e) if $e;
+        return $e;
+    }
+    else {
+        $Foswiki::cfg{LogFileName} =~ s/^NOT SET/$Foswiki::cfg{DataDir}/g;
+        return $this->guessed(0);
+    }
+    return '';
 }
 
 1;

diff --git a/core/lib/Foswiki/Configure/Checkers/WarningFileName.pm b/core/lib/Foswiki/Configure/Checkers/WarningFileName.pm
@@ -10,12 +10,21 @@ use Foswiki::Configure::Load;
 sub check {
     my $this = shift;
 
-    my $logFile = $Foswiki::cfg{WarningFileName} || "";
-    $logFile =~ s/%DATE%/DATE/;
-    Foswiki::Configure::Load::expandValue($logFile);
-    my $e = $this->checkCanCreateFile($logFile);
-    $e = $this->ERROR($e) if $e;
-    return $e;
+    if (   $Foswiki::cfg{WarningFileName}
+        && $Foswiki::cfg{WarningFileName}!~/^NOT SET/ )
+    {
+        my $logFile = $Foswiki::cfg{WarningFileName} || "";
+        $logFile =~ s/%DATE%/DATE/;
+        Foswiki::Configure::Load::expandValue($logFile);
+        my $e = $this->checkCanCreateFile($logFile);
+        $e = $this->ERROR($e) if $e;
+        return $e;
+    }
+    else {
+        $Foswiki::cfg{WarningFileName} =~ s/^NOT SET/$Foswiki::cfg{DataDir}/g;
+        return $this->guessed(0);
+    }
+    return '';
 }
 
 1;