diff options
| -rw-r--r-- | FS/bin/freeside-torrus-srvderive | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/FS/bin/freeside-torrus-srvderive b/FS/bin/freeside-torrus-srvderive index 0bf2db82d..61d5fe69f 100644 --- a/FS/bin/freeside-torrus-srvderive +++ b/FS/bin/freeside-torrus-srvderive @@ -96,22 +96,22 @@ MAIN: while (1) { warn "executing search\n" if $DEBUG; - my $alarm = 0; eval { - my $h = set_sig_handler( 'ALRM', sub { $alarm = 1; } ); + my $h = set_sig_handler( 'ALRM', sub { die "_timeout\n"; } ); alarm(5*60); # 15*60); $sth->execute($serviceid, $serviceid) or die $sth->errstr; alarm(0); }; alarm(0); - die $@ if $@; - if ( $alarm ) { + if ( $@ && $@ eq "_timeout\n" ) { warn "search timed out; reconnecting and restarting\n"; dbh->clone()->do("KILL QUERY ". dbh->{"mysql_thread_id"}) if driver_name eq 'mysql'; adminsuidsetup($user); next MAIN; + } elsif ( $@ ) { + die $@; } warn "search executed; checking results\n" if $DEBUG; |