Codemerge.
Patch by denise.
diffs (21 lines):
diff -r 0bf8e6022067 -r 70e2dbccee35 bin/worker/ljtalk-gm
--- a/bin/worker/ljtalk-gm Sun Jul 05 10:23:02 2009 +0000
+++ b/bin/worker/ljtalk-gm Sun Jul 05 10:24:51 2009 +0000
@@ -57,7 +57,7 @@ sub ljtalk_connection_closing {
if ($@) {
warn "EVAL failure deleting resource $user/$resource: $@" if ($@);
} else {
- warn "Delete of resource $user/$resource = $rv\n";
+ warn "Delete of resource $user/$resource = $rv\n" if
$LJ::IS_DEV_SERVER;
}
return "OK";
@@ -115,7 +115,7 @@ sub ljtalk_initial_presence {
my $count = LJ::Jabber::Presence->delete($u, $resource);
if ($count) {
# Should we disconnect the users from the other clusters when this
happens?
- warn "Deleted $count matching presence entries.";
+ warn "Deleted $count matching presence entries." if $LJ::IS_DEV_SERVER;
}
LJ::Jabber::Presence->create(resource => $resource,
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog