Skip to content

Commit cea25da

Browse files
committed
removed all heartbead code as it was never working
1 parent 85e8f20 commit cea25da

File tree

2 files changed

+8
-47
lines changed

2 files changed

+8
-47
lines changed

README.pod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Daemonise - Daemonise - a general daemoniser for anything...
88

99
=head1 VERSION
1010

11-
version 2.06
11+
version 2.07
1212

1313
=head1 SYNOPSIS
1414

lib/Daemonise/Plugin/RabbitMQ.pm

Lines changed: 7 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -157,32 +157,6 @@ has 'rabbit_consumer_tag' => (
157157
default => sub { '' },
158158
);
159159

160-
=head2 rabbit_heartbeat
161-
162-
=cut
163-
164-
has 'rabbit_heartbeat' => (
165-
is => 'rw',
166-
isa => 'Int',
167-
lazy => 1,
168-
default => sub { 0 },
169-
);
170-
171-
=head2 rabbit_recv_timeout
172-
173-
=cut
174-
175-
has 'rabbit_recv_timeout' => (
176-
is => 'rw',
177-
isa => 'Int',
178-
lazy => 1,
179-
default => sub {
180-
($_[0]->rabbit_heartbeat == 0
181-
? 0
182-
: ($_[0]->rabbit_heartbeat * 1000) / 2);
183-
},
184-
);
185-
186160
=head2 last_delivery_tag
187161
188162
=cut
@@ -394,12 +368,12 @@ sub dequeue {
394368
my $msg;
395369
while (1) {
396370
try {
397-
$frame = $self->mq->recv($self->rabbit_recv_timeout);
371+
$frame = $self->mq->recv();
398372
}
399373
catch {
400374
warn "receiving message failed on first try! >>" . $@ . "<<";
401375
$self->_setup_rabbit_connection;
402-
$frame = $self->mq->recv($self->rabbit_recv_timeout);
376+
$frame = $self->mq->recv();
403377
};
404378

405379
if ($frame) {
@@ -446,10 +420,6 @@ sub dequeue {
446420
}
447421
}
448422
}
449-
else {
450-
$self->log("sending heartbeat to RabbitMQ") if $self->debug;
451-
$self->mq->heartbeat;
452-
}
453423
}
454424

455425
# store delivery tag to ack later
@@ -480,30 +450,21 @@ sub _setup_rabbit_connection {
480450

481451
if (ref($self->config->{rabbitmq}) eq 'HASH') {
482452
foreach
483-
my $conf_key ('user', 'pass', 'host', 'port', 'vhost', 'exchange',
484-
'heartbeat')
453+
my $conf_key ('user', 'pass', 'host', 'port', 'vhost', 'exchange')
485454
{
486455
my $attr = "rabbit_" . $conf_key;
487456
$self->$attr($self->config->{rabbitmq}->{$conf_key})
488457
if defined $self->config->{rabbitmq}->{$conf_key};
489458
}
490459
}
491-
if ($self->rabbit_heartbeat) {
492-
$self->rabbit_recv_timeout((
493-
$self->rabbit_heartbeat == 0
494-
? 0
495-
: ($self->rabbit_heartbeat * 1000) / 2
496-
));
497-
}
498460

499461
eval {
500462
$self->mq->connect(
501463
$self->rabbit_host, {
502-
user => $self->rabbit_user,
503-
password => $self->rabbit_pass,
504-
port => $self->rabbit_port,
505-
vhost => $self->rabbit_vhost,
506-
heartbeat => $self->rabbit_heartbeat,
464+
user => $self->rabbit_user,
465+
password => $self->rabbit_pass,
466+
port => $self->rabbit_port,
467+
vhost => $self->rabbit_vhost,
507468
});
508469
};
509470
my $err = $@;

0 commit comments

Comments
 (0)