Changeset 727

Timestamp:

10/18/06 22:09:19 (2 years ago)

Author:

hachi

Message:

Presence manipulation should only occur in the Plugin context.

Files:

• trunk/DJabberd-LiveJournal/lib/DJabberd/Authen/LiveJournal.pm (modified) (2 diffs)
• trunk/DJabberd-LiveJournal/lib/DJabberd/Plugin/LiveJournal.pm (modified) (2 diffs)

trunk/DJabberd-LiveJournal/lib/DJabberd/Authen/LiveJournal.pm

@@ -6 +6 @@
-
-sub can_check_digest { 1 }
-
-our $cluster_if;
-
-sub cluster_if {
-    return $cluster_if;
-}
-
-sub set_config_clusterif {
-    my ($self, $val) = @_;
-    $cluster_if = $val;
-}
-
-
-sub check_digest {
@@ -38 +26 @@
-    # non-blocking auth lookup, using gearman.
-    if ($gc) {
-, $self->cluster_if
+
-            uniq        => "-",
-            retry_count => 2,

trunk/DJabberd-LiveJournal/lib/DJabberd/Plugin/LiveJournal.pm

@@ -30 +30 @@
-    my $self = shift;
-    die "No gearmand servers configured in GearmanServers\n" unless $gearman_client;
+}
+
+our $cluster_if;
+
+sub cluster_if {
+    return $cluster_if;
+}
+
+sub set_config_clusterif {
+    my ($self, $val) = @_;
+    $cluster_if = $val;
-}
-
@@ -188 +199 @@
-    my $username = $bj->node;
-
+    $gc->add_task(Gearman::Task->new("ljtalk_initial_presence" => \Storable::nfreeze([$username, $bj->resource, $conn->peer_ip_string]), {
+        uniq => '-',
+        retry_count => 2,
+        timeout => 10,
+        on_fail => sub {
+            $DJabberd::Stats::counter{'ljtalk_initial_presence_fail'}++;
+        },
+        on_complete => sub {
+            $DJabberd::Stats::counter{'ljtalk_initial_presence_success'}++;
+        },
+    }));
+
-    $gc->add_task(Gearman::Task->new("ljtalk_user_motd" => \Storable::nfreeze([$username]), {
-        uniq        => "-",