Changeset 860

Timestamp:

03/05/09 01:35:28 (9 months ago)

Author:

mart

Message:

Add a facility for BasePlugin-derived plugins to make configurable function names declaratively.

Location:

trunk/DJabberd-Gearman/lib/DJabberd/Gearman

Files:

• BasePlugin.pm (modified) (1 diff)
• Delivery.pm (modified) (3 diffs)

trunk/DJabberd-Gearman/lib/DJabberd/Gearman/BasePlugin.pm

@@ -100 +100 @@
 }
 
+sub make_configurable_funcs {
+    my ($class, @funcs) = @_;
+
+    no strict 'refs';
+
+    foreach my $func (@funcs) {
+        my $config_name = $func.'_func';
+        my $set_config_name = "set_config_".$func."func";
+        *{$class."::".$set_config_name} = sub {
+            my ($self, $name) = @_;
+            $self->$config_name($name);
+        };
+
+        *{$class."::".$config_name} = sub {
+            my $self = shift;
+
+            if (@_) {
+                $self->{$config_name} = shift;
+                $self->{$config_name} =~ s/^\s*//g;
+                $self->{$config_name} =~ s/\s*$//g;
+            }
+            else {
+                return $self->{$config_name};
+            }
+        };
+    }
+}
+
 1;
 

trunk/DJabberd-Gearman/lib/DJabberd/Gearman/Delivery.pm

@@ -27 +27 @@
 
 use DJabberd::Gearman;
-use base qw(DJabberd::Delivery DJabberd::Gearman::BasePlugin);
+use base qw(DJabberd::Gearman::BasePlugin);
+use DJabberd::Log;
+my $logger = DJabberd::Log->get_logger();
 
-sub set_config_receivefunc {
-    my ($self, $receive_func) = @_;
-
-    $self->{receive_func} = $receive_func;
-    $self->{receive_func} =~ s/^\s*//g;
-    $self->{receive_func} =~ s/\s*$//g;
-}
-
-sub set_config_transmitfunc {
-    my ($self, $transmit_func) = @_;
-
-    $self->{transmit_func} = $transmit_func;
-}
+__PACKAGE__->make_configurable_funcs(qw(receive transmit));
 
 sub register {
@@ -50 +40 @@
     my $client = $self->gearman_client;
 
-    if ($self->{receive_func}) {
+    if ($self->receive_func) {
         $vhost->register_hook('deliver', sub {
             $self->handle_received_stanza(@_);
         });
     }
-
-    return $self->SUPER::register($vhost);
 }
 
@@ -62 +50 @@
     my ($self, $vhost, $cb, $stanza) = @_;
 
-    my $func = $self->{receive_func};
+    my $func = $self->receive_func;
     my $stanza_xml = $stanza->as_xml;
+
+    $logger->debug("Sending stanza to $func function");
 
     $self->call_gearman_func($func, $stanza_xml, {