Commit 1ad9758c authored by sikeda's avatar sikeda
Browse files

[-dev] perltidy'ing.


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@12528 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent e5478aa4
......@@ -617,9 +617,10 @@ my %full_db_struct = (
'order' => 3,
},
'usec_logs' => {
'struct' => 'int(6)',
'doc' => 'subsecond in microsecond when the action was executed',
'order' => 3.5,
'struct' => 'int(6)',
'doc' =>
'subsecond in microsecond when the action was executed',
'order' => 3.5,
},
'robot_logs' => {
'struct' => $robot_struct,
......
......@@ -457,8 +457,7 @@ sub get_first_db_log {
],
);
my $statement =
sprintf q{SELECT date_logs, usec_logs AS usec,
my $statement = sprintf q{SELECT date_logs, usec_logs AS usec,
robot_logs AS robot, list_logs AS list,
action_logs AS action,
parameters_logs AS parameters,
......
......@@ -382,7 +382,7 @@ our %cpan_modules = (
'Used to create URI containing non URI-canonical characters.',
},
'XML::LibXML' => {
required_version => '1.70',
required_version => '1.70',
'gettext_comment' => 'libxml2-devel is needed to build the Perl code',
package_name => 'XML-LibXML',
mandatory => 1,
......
......@@ -56,19 +56,19 @@ sub _init {
$self->{_msgid} = {};
$self->{_msgid_cleanup} = time;
} elsif ($state == 1) {
Sympa::List::init_list_cache();
# Process grouped notifications
Sympa::Alarm->instance->flush;
# Cleanup in-memory msgid table, only in a while.
if (time > $self->{_msgid_cleanup} +
$Conf::Conf{'msgid_table_cleanup_frequency'}) {
$self->_clean_msgid_table();
$self->{_msgid_cleanup} = time;
}
Sympa::List::init_list_cache();
# Process grouped notifications
Sympa::Alarm->instance->flush;
# Cleanup in-memory msgid table, only in a while.
if (time > $self->{_msgid_cleanup} +
$Conf::Conf{'msgid_table_cleanup_frequency'}) {
$self->_clean_msgid_table();
$self->{_msgid_cleanup} = time;
}
} elsif ($state == 2) {
# Free zombie sendmail process.
Sympa::Process->instance->reap_child;
# Free zombie sendmail process.
Sympa::Process->instance->reap_child;
}
1;
......@@ -79,23 +79,23 @@ sub _on_success {
my $message = shift;
my $handle = shift;
if ($self->{keepcopy}) {
unless (
File::Copy::copy(
$self->{distaff}->{directory} . '/' . $handle->basename,
$self->{keepcopy} . '/' . $handle->basename
)
) {
$log->syslog(
'notice',
'Could not rename %s/%s to %s/%s: %m',
$self->{distaff}->{directory},
$handle->basename,
$self->{keepcopy},
$handle->basename
);
}
}
if ($self->{keepcopy}) {
unless (
File::Copy::copy(
$self->{distaff}->{directory} . '/' . $handle->basename,
$self->{keepcopy} . '/' . $handle->basename
)
) {
$log->syslog(
'notice',
'Could not rename %s/%s to %s/%s: %m',
$self->{distaff}->{directory},
$handle->basename,
$self->{keepcopy},
$handle->basename
);
}
}
$self->SUPER::_on_success($message, $handle);
}
......@@ -216,7 +216,8 @@ sub _twist {
|| Sympa::Tools::Data::smart_eq(
Conf::get_robot_conf($robot, 'log_smtp'), 'on');
# Setting log_level using conf unless it is set by calling option.
$log->{level} = (defined $self->{log_level})
$log->{level} =
(defined $self->{log_level})
? $self->{log_level}
: Conf::get_robot_conf($robot, 'log_level');
......@@ -417,7 +418,8 @@ sub _splicing_to {
subscribe => 'Sympa::Spindle::DoCommand',
sympa => 'Sympa::Spindle::DoCommand',
unsubscribe => 'Sympa::Spindle::DoCommand',
}->{$message->{listtype} || ''} || 'Sympa::Spindle::DoMessage';
}->{$message->{listtype} || ''}
|| 'Sympa::Spindle::DoMessage';
}
1;
......
This diff is collapsed.
#!--PERL--
# -*- indent-tabs-mode: nil; -*-
# vim:ft=perl:et:sw=4
# $Id$
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment