Hi soji again,
Hem... Sorry soji, but I have actually another point of view. I
think that at least sympa_priority should become a robot parameter
even though it is not one for now.
for example, as a service provider, you can want some robot to
have an overall priority higher than other robots (a higher
priority for personal robot compared to students robot in a
university, for example).
I think we should change the definition of these parameters
instead of not trying to load the robot parameter.
Cheers,
David
sympa[8084] branches/sympa-6.2-branch/src/lib: [dev]
*_priority (sympa_priority etc.) are site-wide parameters,
impossible to be robot-specific.
- Revision
- 8084
- Author
- sikeda
- Date
- 2012-12-04 16:23:21 +0100 (mar. 04 déc. 2012)
Log Message
[dev] *_priority (sympa_priority etc.) are site-wide parameters, impossible to be robot-specific.
Modified Paths
- branches/sympa-6.2-branch/src/lib/Bulk.pm
- branches/sympa-6.2-branch/src/lib/Upgrade.pm
- branches/sympa-6.2-branch/src/lib/mail.pm
Diff
Modified: branches/sympa-6.2-branch/src/lib/Bulk.pm (8083
=> 8084)
--- branches/sympa-6.2-branch/src/lib/Bulk.pm 2012-12-04 15:02:15 UTC (rev 8083)
+++ branches/sympa-6.2-branch/src/lib/Bulk.pm 2012-12-04 15:23:21 UTC (rev 8084)
@@ -22,38 +22,38 @@
use strict;
use Encode;
-use Fcntl qw(LOCK_SH LOCK_EX LOCK_NB LOCK_UN);
-use Carp;
-use IO::Scalar;
-use Storable;
-use Data::Dumper;
-use Mail::Header;
+#use Fcntl qw(LOCK_SH LOCK_EX LOCK_NB LOCK_UN); # no longer used
+#use Carp; # currently not used
+#use IO::Scalar; # not used
+#use Storable; # no longer used
+#use Mail::Header; # not used
use Mail::Address;
-use Time::HiRes qw(time);
-use Time::Local;
-use MIME::Entity;
-use MIME::EncWords;
+#use Time::HiRes qw(time); #currently not used
+#use Time::Local; # not used
+#use MIME::Entity; # not used
+#use MIME::EncWords; # not used
use MIME::WordDecoder;
use MIME::Parser;
use MIME::Base64;
-use Term::ProgressBar;
+#use Term::ProgressBar; # not used
use URI::Escape;
use constant MAX => 100_000;
use Sys::Hostname;
+# tentative
+use Data::Dumper;
-#use Lock;
-use Fetch;
-use WebAgent;
-#use tools;
-#use tt2;
+#use Lock; # not used
+#use Fetch; # not used
+#use WebAgent; # not used
+#use tools; # used in List - Site - Conf
+#use tt2; # used in List
use Language qw(gettext_strftime);
-#use Log;
-#use Conf;
-#use mail;
-use Ldap;
+#use Log; # used in Conf
+#use mail; # not used
+#use Ldap; # not used
use List;
-use Message;
-#use SDM;
+#use Message; # not used
+#use SDM; # used in Conf
## Database and SQL statement handlers
my $sth;
@@ -385,8 +385,8 @@
&Log::do_log('debug', 'Bulk::store(<msg>,<rcpts>,from = %s,robot = %s,listname= %s,priority_message = %s, delivery_date= %s,verp = %s, tracking = %s, merge = %s, dkim: d= %s i=%s, last: %s)',$from,$robot,$listname,$priority_message,$delivery_date,$verp,$tracking, $merge,$dkim->{'d'},$dkim->{'i'},$tag_as_last);
- $priority_message = &Conf::get_robot_conf($robot,'sympa_priority') unless ($priority_message);
- $priority_packet = &Conf::get_robot_conf($robot,'sympa_packet_priority') unless ($priority_packet);
+ $priority_message = Site->sympa_priority unless $priority_message;
+ $priority_packet = Site->sympa_packet_priority unless $priority_packet;
#creation of a MIME entity to extract the real sender of a message
my $parser = MIME::Parser->new();
@@ -471,8 +471,8 @@
}
my $packetid = &tools::md5_fingerprint($rcptasstring);
my $packet_already_exist;
- if (ref($listname) =~ /List/i) {
- $listname = $listname->{'name'};
+ if (ref $listname eq 'List') {
+ $listname = $listname->name;
}
if ($message_already_on_spool) {
## search if this packet is already in spool database : mailfile may perform multiple submission of exactly the same message
Modified: branches/sympa-6.2-branch/src/lib/Upgrade.pm
(8083 => 8084)
--- branches/sympa-6.2-branch/src/lib/Upgrade.pm 2012-12-04 15:02:15 UTC (rev 8083)
+++ branches/sympa-6.2-branch/src/lib/Upgrade.pm 2012-12-04 15:23:21 UTC (rev 8084)
@@ -26,6 +26,8 @@
#use Carp; # currently not used
use POSIX qw(strftime);
+# tentative
+use Data::Dumper;
use Site;
#use Conf; # used in Site
@@ -33,9 +35,6 @@
#use Sympa::Constants; # used in Conf - confdef
#use SDM; # used in Conf
-# tentative
-use Data::Dumper;
-
## Return the previous Sympa version, ie the one listed in data_structure.version
sub get_previous_version {
my $version_file = Site->etc . '/data_structure.version';
@@ -842,11 +841,11 @@
if ($listname eq Site->listmaster_email) {
$priority = 0;
}elsif ($type eq 'request') {
- $priority = &Conf::get_robot_conf($robot, 'request_priority');
+ $priority = Site->request_priority;
}elsif ($type eq 'owner') {
- $priority = &Conf::get_robot_conf($robot, 'owner_priority');
+ $priority = Site->owner_priority;
}elsif ($listname =~ /^(sympa|$email)(\@$host)?$/i) {
- $priority = &Conf::get_robot_conf($robot,'sympa_priority');
+ $priority = Site->sympa_priority;
$listname ='';
}
$meta{'priority'} = $priority;
Modified: branches/sympa-6.2-branch/src/lib/mail.pm (8083
=> 8084)
--- branches/sympa-6.2-branch/src/lib/mail.pm 2012-12-04 15:02:15 UTC (rev 8083)
+++ branches/sympa-6.2-branch/src/lib/mail.pm 2012-12-04 15:23:21 UTC (rev 8084)
@@ -31,11 +31,12 @@
# tentative
use Data::Dumper;
-use Conf;
+use Site;
+#use Conf; # used in Site
#use Log; # load in Conf
use Language qw(gettext);
#use List; # no longer used
-use Bulk;
+use Bulk; #FIXME: dependency loop between Bulk & mail
#use tools; # load in Conf
#use Sympa::Constants; # load in confdef - Conf
@@ -311,7 +312,7 @@
'from' => $data->{'return_path'},
'robot' => $self,
'listname' => $listname,
- 'priority' => $self->sympa_priority,
+ 'priority' => Site->sympa_priority,
'sign_mode' => $sign_mode,
'use_bulk' => $data->{'use_bulk'},
'dkim' => $data->{'dkim'},
@@ -484,7 +485,7 @@
'rcpt' => $rcpt,
'from' => $from,
'robot' => $robot,
- 'priority'=> $robot->request_priority,
+ 'priority'=> Site->request_priority,
)) {
&Log::do_log('err','mail::mail_forward from %s impossible to send',$from);
return undef;
|
