Blame SOURCES/patch-cassandane-no-syslog
|
 |
d76fc1 |
diff --git a/Cassandane/Util/Log.pm b/Cassandane/Util/Log.pm
|
|
|
d76fc1 |
index 17d2cc7..11b747f 100644
|
|
|
d76fc1 |
--- a/Cassandane/Util/Log.pm
|
|
|
d76fc1 |
+++ b/Cassandane/Util/Log.pm
|
|
|
d76fc1 |
@@ -51,9 +51,6 @@ our @EXPORT = qw(
|
|
|
d76fc1 |
|
|
|
d76fc1 |
my $verbose = 0;
|
|
|
d76fc1 |
|
|
|
d76fc1 |
-openlog('cassandane', '', LOG_LOCAL6)
|
|
|
d76fc1 |
- or die "Cannot openlog";
|
|
|
d76fc1 |
-
|
|
|
d76fc1 |
sub xlog
|
|
|
d76fc1 |
{
|
|
|
d76fc1 |
my $id;
|
|
|
d76fc1 |
@@ -70,7 +67,6 @@ sub xlog
|
|
|
d76fc1 |
$msg .= "($id) " if $id;
|
|
|
d76fc1 |
$msg .= join(' ', @_);
|
|
|
d76fc1 |
print STDERR "$msg\n";
|
|
|
d76fc1 |
- syslog(LOG_ERR, "$msg");
|
|
|
d76fc1 |
}
|
|
|
d76fc1 |
|
|
|
d76fc1 |
sub set_verbose
|
|
|
d76fc1 |
diff --git a/Cassandane/Instance.pm b/Cassandane/Instance.pm
|
|
|
d76fc1 |
index bdfa44f..e852599 100644
|
|
|
d76fc1 |
--- a/Cassandane/Instance.pm
|
|
|
d76fc1 |
+++ b/Cassandane/Instance.pm
|
|
|
d76fc1 |
@@ -2030,12 +2030,8 @@ sub setup_syslog_replacement
|
|
|
d76fc1 |
{
|
|
|
d76fc1 |
my ($self) = @_;
|
|
|
d76fc1 |
|
|
|
d76fc1 |
- if (not(-e 'utils/syslog.so') || not(-e 'utils/syslog_probe')) {
|
|
|
d76fc1 |
- xlog "utils/syslog.so not found (do you need to run 'make'?)";
|
|
|
d76fc1 |
- xlog "tests will not examine syslog output";
|
|
|
d76fc1 |
- $self->{have_syslog_replacement} = 0;
|
|
|
d76fc1 |
- return;
|
|
|
d76fc1 |
- }
|
|
|
d76fc1 |
+ $self->{have_syslog_replacement} = 0;
|
|
|
d76fc1 |
+ return;
|
|
|
d76fc1 |
|
|
|
d76fc1 |
$self->{syslog_fname} = "$self->{basedir}/conf/log/syslog";
|
|
|
d76fc1 |
$self->{have_syslog_replacement} = 1;
|