@@ -146,45 +146,49 @@ else {
### Roles
sub subscriber {
- my $sb = get_agent_connection();
-
- foreach my $topic (@topics) {
- $sb->subscribe({
- topic => $topic,
- on_success => sub {
- diag("%% Subscribed topic '$topic'.");
- },
- on_error => sub {
- diag("ERROR subscribing to topic '$topic':");
- foreach my $e (@_) {
- next if ref($e);
- diag(" $e");
+ my $on_connected = sub {
+ my ($sb) = @_;
+
+ foreach my $topic (@topics) {
+ $sb->subscribe({
+ topic => $topic,
+ on_success => sub {
+ diag("%% Subscribed topic '$topic'.");
+ },
+ on_error => sub {
+ diag("!! ERROR subscribing to topic '$topic':");
+ foreach my $e (@_) {
+ next if ref($e);
+ diag(" $e");
+ }
+ },
+ on_message => sub {
+ my (undef, $notif) = @_;
+ my $payload = $notif->payload;
+ my $topic = $notif->topic;
+ my ($now, $count, $rate, $delta) = _calc_rate($topic);
+
+ my $rt = sprintf('%0.3f mesg/sec (%d messages)', $rate, $count);
+ my $ts = localtime($now->[0]);
+ substr($ts, -5, 0, '.'.substr($now->[1], 0, 4));
+ $ts .= sprintf(' (%0.3f elapsed since last message)', $delta) if $delta;
+
+ my $len = length($payload);
+
+ diag("** Got message on topic '$topic':");
+ diag("** at $ts");
+ diag("** rate for topic is $rt");
+ diag();
+ diag("-- Message starts (length $len)");
+ print $payload,"\n";
+ diag("-- Message ends");
+ diag();
}
- },
- on_message => sub {
- my (undef, $notif) = @_;
- my $payload = $notif->payload;
- my $topic = $notif->topic;
- my ($now, $count, $rate, $delta) = _calc_rate($topic);
+ })
+ }
+ };
- my $rt = sprintf('%0.3f mesg/sec (%d messages)', $rate, $count);
- my $ts = localtime($now->[0]);
- substr($ts, -5, 0, '.'.substr($now->[1], 0, 4));
- $ts .= sprintf(' (%0.3f elapsed since last message)', $delta) if $delta;
-
- my $len = length($payload);
-
- diag("** Got message on topic '$topic':");
- diag("** at $ts");
- diag("** rate for topic is $rt");
- diag();
- diag("-- Message starts (length $len)");
- print $payload,"\n";
- diag("-- Message ends");
- diag();
- }
- })
- }
+ my $sb = get_agent_connection($on_connected);
# Temp hack, deliver_messages() should wait forever
while ($sb->state eq 'connected') { $sb->deliver_messages(5) };
@@ -444,6 +448,8 @@ sub max_rate {
### Agent connection
sub get_agent_connection {
+ my ($on_connected_cb) = @_;
+
my $sb = Net::SAPO::Broker->new({
host => $host,
port => $port,
@@ -453,16 +459,17 @@ sub get_agent_connection {
my $agent = $sb->host;
diag("## Connecting to agent at '$agent'");
},
- on_connected => sub {
+ on_state_connected => sub {
diag("## Connected!");
+ $on_connected_cb->(@_) if $on_connected_cb;
},
- on_eof => sub {
+ on_state_eof => sub {
diag("## Lost connection to agent");
},
on_state_disconnecting => sub {
diag("## Disconnecting");
},
- on_reconnect => sub {
+ on_state_reconnecting => sub {
diag("## Reconnecting");
},
on_read_error => sub {
App-SAPO-Broker-Utils/script/sapo-broker-client
43792ec72abaffc1ec82d81813c9a6f45edf8fb9
Pedro Melo
melo@simplicidade.org
http://github.com/melo/perl-sapo-broker/commit/6bcdac0e15360a7867b785eff8100715e5fc93ba
6bcdac0e15360a7867b785eff8100715e5fc93ba
2008-09-01T10:49:21-07:00
2008-09-01T10:49:21-07:00
Adjust subscriber() role to recover the subscriptions after reconnect
Also updated the callbacks to the new hooks of {Net|Protocol}::SAPO::Broker.
Signed-off-by: Pedro Melo <melo@simplicidade.org>
bfd10f901a824a700c5b2d9e90543705d21a36e4
Pedro Melo
melo@simplicidade.org