This was a workaround for a syslog bug, fixed long time ago ...
PVE::Tools::run_command(['razor-admin', '-register'], timeout => $timeout);
};
my $err = $@;
PVE::Tools::run_command(['razor-admin', '-register'], timeout => $timeout);
};
my $err = $@;
- syslog('info', msgquote ("registering razor failed: $err")) if $err;
+ syslog('info', "registering razor failed: $err") if $err;
eval {
PMG::Utils::gen_proxmox_tls_cert();
};
eval {
PMG::Utils::gen_proxmox_tls_cert();
};
- syslog ('info', msgquote ("generating certificate failed: $@")) if $@;
+ syslog ('info', "generating certificate failed: $@") if $@;
}
$changes = 1 if $self->rewrite_config_file(
}
$changes = 1 if $self->rewrite_config_file(
$dbh->disconnect() if $dbh;
$dbh->disconnect() if $dbh;
- if ($err) {
- syslog('err', PMG::Utils::msgquote($err));
- }
+ syslog('err', $err) if $err;
$dbh->rollback; # end transaction
$dbh->rollback; # end transaction
- syslog ('err', PMG::Utils::msgquote("unable to load rulecache : $err")) if $err;
+ syslog ('err', "unable to load rulecache : $err") if $err;
eval { cluster_sync(); };
if (my $err = $@) {
eval { cluster_sync(); };
if (my $err = $@) {
- syslog('err', PMG::Utils::msgquote ("sync error: $err"));
+ syslog('err', "sync error: $err");
-sub msgquote {
- my $msg = shift || '';
- $msg =~ s/%/%%/g;
- return $msg;
-}
-
sub lastid {
my ($dbh, $seq) = @_;
sub lastid {
my ($dbh, $seq) = @_;
};
if (my $err = $@) {
$dbh->rollback if $dbh;
};
if (my $err = $@) {
$dbh->rollback if $dbh;
- syslog('err', PMG::Utils::msgquote($err));
} else {
syslog('info', "cleanup removed $srows entries from " .
"statistic database ($srows, $rrows)") if $srows;
} else {
syslog('info', "cleanup removed $srows entries from " .
"statistic database ($srows, $rrows)") if $srows;
PMG::Utils::update_node_status_rrd();
};
if ($err = $@) {
PMG::Utils::update_node_status_rrd();
};
if ($err = $@) {
- $self->log(0, PMG::Utils::msgquote("ERROR: $err"));
+ $self->log(0, "ERROR: $err");
$dbh = PMG::DBTools::open_ruledb($database);
};
if ($err = $@) {
$dbh = PMG::DBTools::open_ruledb($database);
};
if ($err = $@) {
- $self->log (0, PMG::Utils::msgquote("ERROR: $err"));
+ $self->log (0, "ERROR: $err");
my $ptime = int (($csec_end-$csec)*1000 + ($usec_end - $usec)/1000);
if ($err) {
my $ptime = int (($csec_end-$csec)*1000 + ($usec_end - $usec)/1000);
if ($err) {
- $self->log (0, PMG::Utils::msgquote($err));
} else {
$self->log (2, "end database maintainance ($ptime ms)");
}
} else {
$self->log (2, "end database maintainance ($ptime ms)");
}
my $err = $@;
if ($err) {
my $err = $@;
if ($err) {
- $self->log(0, PMG::Utils::msgquote("ERROR: $err"));
+ $self->log(0, "ERROR: $err");
# this produces too much log traffic
# my $targets = join (", ", @rcvrs);
#my $msg = "expire mail $ref->{instance} from $ref->{sender} to $targets";
# this produces too much log traffic
# my $targets = join (", ", @rcvrs);
#my $msg = "expire mail $ref->{instance} from $ref->{sender} to $targets";
- #$self->log (0, PMG::Utils::msgquote ($msg));
}
$dbh->do ($cmds) if $cmds;
}
$dbh->do ($cmds) if $cmds;
if ($err) {
$dbh->rollback if $dbh;
if ($err) {
$dbh->rollback if $dbh;
- $self->log(0, PMG::Utils::msgquote($err));
} else {
$self->log(2, "end greylist database maintainance ($ptime ms)");
}
} else {
$self->log(2, "end greylist database maintainance ($ptime ms)");
}
$self->{rulecache} = PMG::RuleCache->new($self->{ruledb});
};
if (my $err = $@) {
$self->{rulecache} = PMG::RuleCache->new($self->{ruledb});
};
if (my $err = $@) {
- $self->log(0, PMG::Utils::msgquote("ERROR: unable to load database : $err"));
+ $self->log(0, "ERROR: unable to load database : $err");
}
$self->{reload_config} = 0;
}
$self->{reload_config} = 0;
hostname => $self->{fqdn}, dns_resolver => $self->{dns_resolver});
};
if (my $err = $@) {
hostname => $self->{fqdn}, dns_resolver => $self->{dns_resolver});
};
if (my $err = $@) {
- $self->log(0, PMG::Utils::msgquote($err));
$self->child_finish_hook;
exit(-1);
}
$self->child_finish_hook;
exit(-1);
}
};
my $err = $@;
if ($err) {
};
my $err = $@;
if ($err) {
- $self->log(0, PMG::Utils::msgquote("unable to reconnect to database server: $err"));
+ $self->log(0, "unable to reconnect to database server: $err");
return 'dunno';
}
$self->{ruledb} = PMG::RuleDB->new($dbh);
return 'dunno';
}
$self->{ruledb} = PMG::RuleDB->new($dbh);
if ($err) {
$err = $err->text if UNIVERSAL::isa ($err, 'Mail::SPF::Exception');
if ($err) {
$err = $err->text if UNIVERSAL::isa ($err, 'Mail::SPF::Exception');
- $self->log (0, PMG::Utils::msgquote($err));
} else {
if ($result && $result eq 'pass') {
} else {
if ($result && $result eq 'pass') {
};
if (my $err = $@) {
$dbh->rollback;
};
if (my $err = $@) {
$dbh->rollback;
- $self->log(0, PMG::Utils::msgquote($err));
};
if (my $err = $@) {
$dbh->rollback;
};
if (my $err = $@) {
$dbh->rollback;
- $self->log (0, PMG::Utils::msgquote($err));
lc ($attribute->{instance}));
};
if (my $err = $@) {
lc ($attribute->{instance}));
};
if (my $err = $@) {
- $self->log(0, PMG::Utils::msgquote($err));
- $self->log(0, PMG::Utils::msgquote($err)) if $err;
+ $self->log(0, $err) if $err;
}
sub restart_close_hook {
}
sub restart_close_hook {
# sometimes the socket is not usable, don't know why
my $flags = fcntl($sock, F_GETFL, 0);
if (!$flags) {
# sometimes the socket is not usable, don't know why
my $flags = fcntl($sock, F_GETFL, 0);
if (!$flags) {
- $self->log(0, PMG::Utils::msgquote("socket not ready - $!"));
+ $self->log(0, "socket not ready - $!");
$mux->loop;
};
if (my $err = $@) {
$mux->loop;
};
if (my $err = $@) {
- $self->log(0, PMG::Utils::msgquote("ERROR: $err"));
+ $self->log(0, "ERROR: $err");
}
$self->child_finish_hook;
}
$self->child_finish_hook;