File patch-cassandane-no-syslog of Package cyrus-imapd-3

42
 
1
diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
2
index fb36b8f..78e7100 100644
3
--- a/Cassandane/Instance.pm
4
+++ b/Cassandane/Instance.pm
5
@@ -2146,12 +2146,8 @@ sub setup_syslog_replacement
6
 {
7
     my ($self) = @_;
8
 
9
-    if (not(-e 'utils/syslog.so') || not(-e 'utils/syslog_probe')) {
10
-        xlog "utils/syslog.so not found (do you need to run 'make'?)";
11
-        xlog "tests will not examine syslog output";
12
-        $self->{have_syslog_replacement} = 0;
13
-        return;
14
-    }
15
+    $self->{have_syslog_replacement} = 0;
16
+    return;
17
 
18
     $self->{syslog_fname} = "$self->{basedir}/conf/log/syslog";
19
     $self->{have_syslog_replacement} = 1;
20
diff --git a/Cassandane/Util/Log.pm b/Cassandane/Util/Log.pm
21
index 7c17f0c..9eb07ad 100644
22
--- a/Cassandane/Util/Log.pm
23
+++ b/Cassandane/Util/Log.pm
24
@@ -51,9 +51,6 @@ our @EXPORT = qw(
25
 
26
 my $verbose = 0;
27
 
28
-openlog('cassandane', '', LOG_LOCAL6)
29
-    or die "Cannot openlog";
30
-
31
 sub xlog
32
 {
33
     my $id;
34
@@ -74,7 +71,6 @@ sub xlog
35
     $msg .= "($id) " if $id;
36
     $msg .= join(' ', @_);
37
     print STDERR "$msg\n";
38
-    syslog(LOG_ERR, "$msg");
39
 }
40
 
41
 sub set_verbose
42