Changeset 660

Timestamp:

08/01/06 05:53:47 (4 years ago)

Author:

sky

Message:

all set of changes from my dev environment that svk lost somehow, probably because of corrupt disk

Location:

trunk

Files:

• doc/TODO (modified) (1 diff)
• etc/log.conf.default (modified) (1 diff)
• lib/DJabberd/Authen/LiveJournal.pm (modified) (1 diff)
• lib/DJabberd/Connection/ClientIn.pm (modified) (2 diffs)
• lib/DJabberd/HookDocs.pm (modified) (2 diffs)
• lib/DJabberd/Plugin/LiveJournal.pm (modified) (9 diffs)
• lib/DJabberd/Presence.pm (modified) (1 diff)

trunk/doc/TODO

@@ +1 @@
+--test
+
 -- ACKing: http://www.jabber.org/jeps/inbox/ack.html .  does anybody do this?
    if they do, and declare the xmlns in open stream, our reusing parser might eat it.

trunk/etc/log.conf.default

@@ -7 +7 @@
 # at DEBUG it shows all raw traffic
 # at INFO  it censors out the actual data
-log4perl.logger.DJabberd.Connection.XML = INFO
+log4perl.logger.DJabberd.Connection.XML = WARN
 
 

trunk/lib/DJabberd/Authen/LiveJournal.pm

@@ -24 +24 @@
     # non-blocking auth lookup, using gearman.
     if ($gc) {
-        $gc->add_task(Gearman::Task->new("ljtalk_auth_check" => \ "$user,$streamid,$digest", {
+         $gc->add_task(Gearman::Task->new("ljtalk_auth_check" => \Storable::nfreeze([$user,$streamid,$digest,$resource, $conn->peer_ip_string]), {
             uniq        => "-",
             retry_count => 2,

trunk/lib/DJabberd/Connection/ClientIn.pm

@@ -111 +111 @@
 sub close {
     my $self = shift;
-    return if $self->{closed};
+    return if $self->{closed}++;
 
     # send an unavailable presence broadcast if we've gone away
@@ -130 +130 @@
     }
 
-    $self->SUPER::close;
+    if ($self->vhost->are_hooks("ConnectionClosing")) {
+        $self->vhost->run_hook_chain(phase => "ConnectionClosing",
+                               args  => [ $self ],
+                               methods => {
+                                   fallback => sub {
+                                       $self->SUPER::close;
+                                   },
+                               },
+                               );
+
+    } else {
+        $self->SUPER::close;
+    }
 }
 

trunk/lib/DJabberd/HookDocs.pm

@@ -145 +145 @@
         done => {},
     },
-    des => "Place to alter outgoing presence available packets from users, in-place.  Just modify the provided second argument",
+    des => "Place to alter outgoing presence available packets from users, in-place.  Just modify the provided second argument, warning will see directed ones",
+};
+
+$hook{'AlterPresenceUnavailable'} = {
+    args => ['Connection', 'Presence'],
+    callback => {
+        done => {},
+    },
+    des => "Place to alter outgoing presence unavailable packets from users, in-place.  Just modify the provided second argument, warning will see directed ones",
 };
 
@@ -155 +163 @@
 };
 
+$hook{'ConnectionClosing'} = {
+    args => ['Connection'],
+    callback => {
+        done => {},
+    },
+    des => "Gets called when a connection is in closing state, you can't do anything but let it fall through",
+};
+
 1;

trunk/lib/DJabberd/Plugin/LiveJournal.pm

@@ -6 +6 @@
 use MIME::Base64;
 use Gearman::Client::Async;
-
+use Gearman::Client;
 use LWP::Simple;
 
@@ -13 +13 @@
 my $start_time = time();
 
+our @gearman_servers;
 our $gearman_client;
 sub gearman_client {
@@ -20 +21 @@
 sub set_config_gearmanservers {
     my ($self, $val) = @_;
-    my @list = split(/\s*,\s*/, $val);
+    @gearman_servers = split(/\s*,\s*/, $val);
     $gearman_client = Gearman::Client::Async->new;
-    $gearman_client->set_job_servers(@list);
+    $gearman_client->set_job_servers(@gearman_servers);
 }
 
@@ -42 +43 @@
     $vhost->register_hook("OnInitialPresence",      \&hook_on_initial_presence);
     $vhost->register_hook("AlterPresenceAvailable", \&hook_alter_presence);
+    $vhost->register_hook("AlterPresenceUnavailable", \&hook_alter_presence);
+    $vhost->register_hook("ConnectionClosing", \&hook_connection_closing);
     $vhost->add_feature("vcard-temp");
-}
+
+    # make sure we init this cluster node when it comes up
+    my $gc = Gearman::Client->new;
+    $gc->job_servers(@gearman_servers);
+    my $rv = $gc->do_task("ljtalk_init", $vhost->server_name . "_cluster_ip_port", {timeout => 5});
+    die "Couldn't init LJ Plugin" unless $$rv eq 'OK';
+
+}
+
+sub get_vcard_keyword {
+    my ($self, $jid, $last_bcast) = @_;
+    $last_bcast ||= DJabberd::Presence->local_presence_info($jid);
+    my $keyword;
+    if (keys %$last_bcast) {
+        foreach my $value (values %$last_bcast) {
+            foreach my $ele ($value->children_elements) {
+                if ($ele->element_name eq 'status') {
+                    $keyword = $ele->first_child;
+                }
+                last;
+            }
+        }
+    }
+    return $keyword;
+}
+
 
 sub get_vcard {
@@ -70 +98 @@
     }
 
-    $gc->add_task(Gearman::Task->new("ljtalk_avatar_data" => \ "$username", {
+
+    my $keyword = $self->get_vcard_keyword($iq->to_jid);
+
+    warn "get $keyword";
+
+    $gc->add_task(Gearman::Task->new("ljtalk_avatar_data" => \Storable::nfreeze([$username, $keyword]), {
         uniq        => "-",
         retry_count => 2,
@@ -141 +174 @@
     return if $bj->node eq 'mart';
 
-    $conn->write("<message to='$bj' from='livejournal.com' type='headline'><body>LJ Talk is currently a pre-alpha service lacking tons of features and probably with a bunch of bugs.
-
-We're actively developing it, constantly restarting it with new stuff.  So just don't be surprised if the service goes up and down $how_much.</body></message>");
+#    $conn->write("<message to='$bj' from='livejournal.com' type='headline'><body>LJ Talk is currently a pre-alpha service lacking tons of features and probably with a bunch of bugs.
+
+#We're actively developing it, constantly restarting it with new stuff.  So just don't be surprised if the service goes up and down $how_much.</body></message>");
 }
 
@@ -178 +211 @@
 }
 
+sub hook_connection_closing {
+    my (undef, $cb, $conn) = @_;
+
+    my $bj = $conn->bound_jid;
+    my $gc = DJabberd::Plugin::LiveJournal->gearman_client;
+
+    unless ($bj && $gc) {
+        $cb->done;
+        return;
+    }
+
+    $gc->add_task(Gearman::Task->new("ljtalk_connection_closing" => \Storable::nfreeze([$bj->node, $bj->resource]), {
+                                     uniq => '-',
+                                     retry_count => 2,
+                                     timeout => 10,
+                                     on_fail => sub {
+                                         $DJabberd::Stats::counter{'ljtalk_alter_presence_fail'}++;
+                                     },
+                                     on_complete => sub {
+                                         $DJabberd::Stats::counter{'ljtalk_alter_presence_success'}++;
+                                     },
+                                 }));
+
+    $cb->decline;
+}
+
 sub hook_alter_presence {
     my (undef, $cb, $conn, $pkt) = @_;
@@ -189 +248 @@
     }
 
+
+    my $priority;
     foreach my $ele ($pkt->children_elements) {
+        if ($ele->element_name eq 'priority') {
+            $priority = $ele->first_child;
+        }
         next unless ($ele->inner_ns || '') eq "vcard-temp:x:update" && $ele->element_name eq "x";
         $pkt->remove_child($ele);
@@ -197 +261 @@
     my $user = $bj->node;
 
-    $gc->add_task(Gearman::Task->new("ljtalk_avatar_sha1" => \ "$user", {
+    $gc->add_task(Gearman::Task->new("ljtalk_alter_presence" => \Storable::nfreeze([$bj->node, $bj->resource, $priority,  $pkt->as_xml]), {
+                                     uniq => '-',
+                                     retry_count => 2,
+                                     timeout => 10,
+                                     on_fail => sub {
+                                         $DJabberd::Stats::counter{'ljtalk_alter_presence_fail'}++;
+                                     },
+                                     on_complete => sub {
+                                         $DJabberd::Stats::counter{'ljtalk_alter_presence_success'}++;
+                                     },
+                                 }));
+
+    my $keyword = __PACKAGE__->get_vcard_keyword($bj, { dummy => $pkt });
+
+
+    $gc->add_task(Gearman::Task->new("ljtalk_avatar_sha1" => \Storable::nfreeze([$user, $keyword]), {
         uniq        => "-",
         retry_count => 2,

trunk/lib/DJabberd/Presence.pm

@@ -477 +477 @@
 
 sub _process_outbound_unavailable {
-    my ($self, $conn) = @_;
+    my ($self, $conn, $skip_alter) = @_;
+
+    my $vhost = $conn->vhost;
+    if (!$skip_alter && $vhost->are_hooks("AlterPresenceUnavailable")) {
+        warn "runnig hook chain unavailable";
+        $vhost->run_hook_chain(phase => "AlterPresenceUnavailable",
+                               args  => [ $conn, $self ],
+                               methods => {
+                                   done => sub {
+                                       return if $conn->{closed};
+                                       $self->_process_outbound_unavailable($conn, 1);
+                                   },
+                               },
+                               );
+        return;
+    }
+
+
     if ($self->is_directed) {
         delete($conn->{directed_presence}->{$self->to_jid});