Commit bc352208 authored by Geoff Simmons's avatar Geoff Simmons

Prototype v0.5.4: Forward-porting v0.4.3 (bugfix: Monitoring thread

continues to run after child process restart)
parent e2dfa56d
...@@ -212,7 +212,7 @@ use Getopt::Std; ...@@ -212,7 +212,7 @@ use Getopt::Std;
use Pod::Usage; use Pod::Usage;
$Getopt::Std::STANDARD_HELP_VERSION = 1; $Getopt::Std::STANDARD_HELP_VERSION = 1;
$main::VERSION = "0.5.3"; $main::VERSION = "0.5.4";
sub HELP_MESSAGE { sub HELP_MESSAGE {
pod2usage(-exit => 0, -verbose => 1); pod2usage(-exit => 0, -verbose => 1);
...@@ -529,7 +529,6 @@ sub fork_varnishlog { ...@@ -529,7 +529,6 @@ sub fork_varnishlog {
sub run_varnishlog { sub run_varnishlog {
$records = 0; $records = 0;
$quit = 0;
# Prepare MQ or HTTP transport # Prepare MQ or HTTP transport
&{$connect{prep}}(\%connect); &{$connect{prep}}(\%connect);
...@@ -558,6 +557,7 @@ sub run_varnishlog { ...@@ -558,6 +557,7 @@ sub run_varnishlog {
my (%record, %dubious_tid); my (%record, %dubious_tid);
$open = 0; $open = 0;
$dubious = 0; $dubious = 0;
$quit = 0;
my $monitor = threads->create(\&statusThread, my $monitor = threads->create(\&statusThread,
$config{'monitor.interval'}); $config{'monitor.interval'});
unless (defined $monitor) { unless (defined $monitor) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment