return if $wq->{-wq_worker_nr} != 0;
my $lei = $wq->{lei};
my $net = $lei->{net};
- my $mics = $net->imap_common_init($lei);
- my $nn = $net->nntp_common_init($lei);
- pkt_do($lei->{pkt_op_p}, 'net_merge', $net) or
- die "pkt_do net_merge: $!";
- $net->{mics_cached} = $mics if $mics;
- $net->{nn_cached} = $nn if $nn;
+ eval {
+ my $mics = $net->imap_common_init($lei);
+ my $nn = $net->nntp_common_init($lei);
+ pkt_do($lei->{pkt_op_p}, 'net_merge_continue', $net) or
+ die "pkt_do net_merge_continue: $!";
+ $net->{mics_cached} = $mics if $mics;
+ $net->{nn_cached} = $nn if $nn;
+ };
+ $lei->fail($@) if $@;
}
sub net_merge_done1 { # bump merge-count in top-level lei-daemon
my ($wq) = @_;
return if ++$wq->{nr_net_merge_done} != $wq->{-wq_nr_workers};
- $wq->net_merge_complete; # defined per wq-class (e.g. LeiImport)
+ $wq->net_merge_all_done; # defined per wq-class (e.g. LeiImport)
}
sub net_merge_all { # called in wq worker via wq_broadcast
sub op_merge { # prepares PktOp->pair ops
my ($self, $ops, $wq) = @_;
- $ops->{net_merge} = [ \&net_merge_continue, $wq ];
+ $ops->{net_merge_continue} = [ \&net_merge_continue, $wq ];
$ops->{net_merge_done1} = [ \&net_merge_done1, $wq ];
}