Changeset 24484

Show
Ignore:
Timestamp:
26.08.2011 00:25:37 (8 years ago)
Author:
davidb
Message:

Tidy up (pass 1)

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/solr/trunk/src/perllib/solrserver.pm

    r24483 r24484  
    3232use solrutil; 
    3333 
    34 my $key_count = 0; 
    35  
    3634sub new { 
    3735    my $class = shift(@_); 
    3836 
    39     $key_count++; 
    40     my $self = { 'jetty_stop_key' => "greenstone-solr-".$$."-".$key_count }; 
     37    my $self = { 'jetty_stop_key' => "greenstone-solr" }; 
    4138 
    4239    my $search_path = &solrutil::get_search_path(); 
     
    7067     
    7168    my $cmd = "wget -O - \"$url\" 2>&1"; 
    72  
    73 ##    print STDERR "**** wget cmd: $cmd\n"; 
    7469 
    7570    my $preamble_output = "";     
     
    200195    } 
    201196 
    202  
    203197    return $ping_status; 
    204198} 
     
    264258 
    265259    my $server_already_running = $self->server_running(); 
    266  
    267 ##    print STDERR "**** already running = $server_already_running\n"; 
    268260 
    269261    if ($server_already_running) { 
     
    359351    print STDERR "Using existing server detected on port $jetty_server_port\n"; 
    360352    $self->{'jetty_explicitly_started'} = 0; 
    361  
    362     # silently stop our unneeded jetty server, using its unique key 
    363  
    364 #   my $options = { 'do_wait' => 0, 'output_verbosity' => 2 }; 
    365  
    366 #   $self->stop($options); 
    367  
    368     # Consume any remaining (buffered) output (not interested in values) 
    369 #   my $line; 
    370 #   while (defined ($line = <STARTIN>)) {  
    371         # skip info lines 
    372 #   } 
    373 #   close(STARTIN); 
    374353    } 
    375354    elsif ($server_status eq "failed-to-start") { 
     
    387366    return $self->{'jetty_explicitly_started'}; 
    388367} 
    389  
    390  
    391368 
    392369sub stop