X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3fa594f62fb6816adb0c425f183f0483240f41c1..2869b65bcb5fa65ea0505c6fa513aeea9a0fbdc6:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 75c957932..2c0b1153c 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -515,9 +515,8 @@ sub getsetup () {
 	},
 	cookiejar => {
 		type => "string",
-		default => "$ENV{HOME}/.ikiwiki/cookies",
+		default => { file => "$ENV{HOME}/.ikiwiki/cookies" },
 		description => "cookie control",
-		example => { file => "$ENV{HOME}/.ikiwiki/cookies" },
 		safe => 0, # hooks into perl module internals
 		rebuild => 0,
 	},
@@ -729,6 +728,7 @@ sub debug ($) {
 }
 
 my $log_open=0;
+my $log_failed=0;
 sub log_message ($$) {
 	my $type=shift;
 
@@ -739,9 +739,15 @@ sub log_message ($$) {
 			Sys::Syslog::openlog('ikiwiki', '', 'user');
 			$log_open=1;
 		}
-		return eval {
+		eval {
 			Sys::Syslog::syslog($type, "[$config{wikiname}] %s", join(" ", @_));
 		};
+                if ($@) {
+                    print STDERR "failed to syslog: $@" unless $log_failed;
+                    $log_failed=1;
+                    print STDERR "@_\n";
+                }
+                return $@;
 	}
 	elsif (! $config{cgi}) {
 		return print "@_\n";