Skip to content

Commit 1632f6d

Browse files
author
Jan Henning Thorsen
committed
Mojo::EventEmitter::emit_safe is DEPRECATED
1 parent 48e2e63 commit 1632f6d

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

Changes

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
Revision history for Mojo-IOLoop-ReadWriteFork
22

3-
0.0601
3+
0.07
44
* Trying to fix t/telnet.t with 127.0.0.1
5+
* Mojo::EventEmitter::emit_safe is DEPRECATED
56

67
0.06 Mon Aug 11 16:59:18 2014
78
* Fix "Use of uninitialized value in numeric eq (==) at ReadWriteFork.pm line 182."

lib/Mojo/IOLoop/ReadWriteFork.pm

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ sub _start {
177177
my $pid;
178178

179179
if($args->{conduit} eq 'pipe') {
180-
pipe $stdout_read, $stdout_write or return $self->emit_safe(error => "pipe: $!");
181-
pipe $stdin_read, $stdin_write or return $self->emit_safe(error => "pipe: $!");
180+
pipe $stdout_read, $stdout_write or return $self->emit(error => "pipe: $!");
181+
pipe $stdin_read, $stdin_write or return $self->emit(error => "pipe: $!");
182182
select +(select($stdout_write), $| = 1)[0];
183183
select +(select($stdin_write), $| = 1)[0];
184184
}
@@ -187,14 +187,14 @@ sub _start {
187187
}
188188
else {
189189
warn "Invalid conduit ($args->{conduit})\n" if DEBUG;
190-
return $self->emit_safe(error => "Invalid conduit ($args->{conduit})");
190+
return $self->emit(error => "Invalid conduit ($args->{conduit})");
191191
}
192192

193193
$pid = fork;
194194

195195
if(!defined $pid) {
196196
warn "Could not fork $!\n" if DEBUG;
197-
$self->emit_safe(error => "Couldn't fork ($!)");
197+
$self->emit(error => "Couldn't fork ($!)");
198198
}
199199
elsif($pid) { # parent ===================================================
200200
warn "[$pid] Child starting ($args->{program} @{$args->{program_args}})\n" if DEBUG;
@@ -219,7 +219,7 @@ sub _start {
219219
}
220220
elsif($self->{errno}) {
221221
warn "[$pid] Child $self->{errno}\n" if DEBUG;
222-
$self->emit_safe(error => "Read error: $self->{errno}");
222+
$self->emit(error => "Read error: $self->{errno}");
223223
}
224224
});
225225
$self->reactor->watch($stdout_read, 1, 0);
@@ -279,7 +279,7 @@ sub _setup_recurring_child_alive_check {
279279
warn "[$pid] Child is dead $exit_value/$signal\n" if DEBUG;
280280
delete $reactor->{forks}{$pid} or next; # SUPER DUPER IMPORTANT THAT THIS next; IS NOT BEFORE waitpid; ABOVE!
281281
$obj->_read; # flush the rest
282-
$obj->emit_safe(close => $exit_value, $signal);
282+
$obj->emit(close => $exit_value, $signal);
283283
$obj->_cleanup;
284284
}
285285
});
@@ -354,7 +354,7 @@ sub _read {
354354
return unless defined $read;
355355
return unless $read;
356356
warn "[$self->{pid}] Got buffer (" .url_escape($buffer) .")\n" if DEBUG;
357-
$self->emit_safe(read => $buffer);
357+
$self->emit(read => $buffer);
358358
}
359359

360360
sub _write {
@@ -373,7 +373,7 @@ sub _write {
373373
$self->reactor->timer(0.01 => sub { $self and $self->_write });
374374
}
375375
else {
376-
$self->emit_safe('drain');
376+
$self->emit('drain');
377377
}
378378
}
379379

0 commit comments

Comments
 (0)