Show
Ignore:
Timestamp:
16.07.2014 21:09:14 (5 years ago)
Author:
ak19
Message:

Part of port from lucene3.3.0 to lucene4.7.2. Solr related. 1. Java and perl code changes for solr4.7.2; 2. Dr Bainbridge further fixed a bug in how the variable called running is set in solrserver.pm

Files:
1 modified

Legend:

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

    r28182 r29142  
    158158    my $have_error = defined $output->{'error'}; 
    159159 
    160     my $running = !$have_error; 
     160    my $running = ($have_error) ? 0 : 1; 
    161161 
    162162    return $running; 
     
    407407    my $full_server_jar = $self->{'full_server_jar'}; 
    408408     
    409     my $server_java_cmd = "java $server_props -jar \"$full_server_jar\""; 
     409    # https://wiki.apache.org/solr/SolrLogging 
     410    my $solr_slf4j    = &util::filename_cat($solr_home, "lib", "ext"); 
     411    my $solr_log4j    = &util::filename_cat($solr_home, "conf", "log4j.properties"); 
     412    my $server_java_cmd = "java -Dlog4j.configuration=file://$solr_log4j -classpath \"$solr_home/lib/java/*:$solr_slf4j/*\" $server_props -jar \"$full_server_jar\""; 
    410413 
    411414 
     
    431434        } 
    432435         
    433         if ($line =~ m/WARN::failed SocketConnector/) { 
     436        if ($line =~ m/WARN.*failed SocketConnector/) { 
    434437        if ($line =~ m/Address already in use/) { 
    435438            $server_status = "already-running"; 
     
    441444        } 
    442445         
    443         if ($line =~ m/INFO::Started SocketConnector/) { 
     446        if ($line =~ m/INFO.*Started SocketConnector/) { 
    444447        $server_status = "explicitly-started"; 
    445448        last;