Changeset 24484 for gs3-extensions/solr/trunk/src/perllib

Timestamp:

2011-08-26T00:25:37+12:00 (12 years ago)

Author:

davidb

Message:

Tidy up (pass 1)

File:

• gs3-extensions/solr/trunk/src/perllib/solrserver.pm (modified) (6 diffs)

gs3-extensions/solr/trunk/src/perllib/solrserver.pm

@@ -32 +32 @@
 use solrutil;
 
-my $key_count = 0;
-
 sub new {
     my $class = shift(@_);
 
-    $key_count++;
-    my $self = { 'jetty_stop_key' => "greenstone-solr-".$$."-".$key_count };
+    my $self = { 'jetty_stop_key' => "greenstone-solr" };
 
     my $search_path = &solrutil::get_search_path();
@@ -70 +67 @@
     
     my $cmd = "wget -O - \"$url\" 2>&1";
-
-##    print STDERR "**** wget cmd: $cmd\n";
 
     my $preamble_output = "";    
@@ -200 +195 @@
     }
 
-
     return $ping_status;
 }
@@ -264 +258 @@
 
     my $server_already_running = $self->server_running();
-
-##    print STDERR "**** already running = $server_already_running\n";
 
     if ($server_already_running) {
@@ -359 +351 @@
     print STDERR "Using existing server detected on port $jetty_server_port\n";
     $self->{'jetty_explicitly_started'} = 0;
-
-    # silently stop our unneeded jetty server, using its unique key
-
-#   my $options = { 'do_wait' => 0, 'output_verbosity' => 2 };
-
-#   $self->stop($options);
-
-    # Consume any remaining (buffered) output (not interested in values)
-#   my $line;
-#   while (defined ($line = <STARTIN>)) { 
-        # skip info lines
-#   }
-#   close(STARTIN);
     }
     elsif ($server_status eq "failed-to-start") {
@@ -387 +366 @@
     return $self->{'jetty_explicitly_started'};
 }
-
-
 
 sub stop