Changeset 24c830d2b69af440350f3aadefcd0a23491e2dab

Show
Ignore:
Timestamp:
07/08/11 02:52:49 (3 years ago)
Author:
Theo Schlossnagle <jesus@omniti.com>
git-committer:
Theo Schlossnagle <jesus@omniti.com> 1310093569 -0400
git-parent:

[58f90423160bc5252603326f4eabcbe2b6fee79b]

git-author:
Theo Schlossnagle <jesus@omniti.com> 1310093569 -0400
Message:

support B{1,2} in the IEP system

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/java/Makefile.in

    r1c72b25 r24c830d  
    2626        com/omniti/reconnoiter/EventHandler.java \ 
    2727        com/omniti/reconnoiter/MessageHandler.java \ 
     28        com/omniti/reconnoiter/CheckStatus.java \ 
    2829        com/omniti/reconnoiter/broker/NoitListener.java \ 
    2930        com/omniti/reconnoiter/broker/RabbitBroker.java \ 
     
    3435        com/omniti/reconnoiter/broker/BrokerFactory.java \ 
    3536        com/omniti/reconnoiter/event/NoitEvent.java \ 
     37        com/omniti/reconnoiter/event/NoitBundlev1.java \ 
     38        com/omniti/reconnoiter/event/NoitBundlev2.java \ 
    3639        com/omniti/reconnoiter/event/NoitCheck.java \ 
    3740        com/omniti/reconnoiter/event/NoitStatus.java \ 
     
    8285        lib/cglib-nodep-2.2.jar lib/commons-pool-1.4.jar lib/commons-dbcp-1.2.2.jar \ 
    8386        lib/postgresql-8.3-604.jdbc3.jar lib/rabbitmq-client-2.4.1.jar lib/commons-io-1.2.jar \ 
    84         lib/commons-cli-1.1.jar lib/commons-logging-1.1.1.jar 
     87        lib/commons-cli-1.1.jar lib/commons-logging-1.1.1.jar lib/commons-codec-1.5.jar \ 
     88        lib/protobuf-java-2.4.1.jar 
    8589 
    8690J_SUPPORT=lib/log4j-1.2.15.jar \ 
  • src/java/com/omniti/reconnoiter/StratconMessage.java

    rd483232 r24c830d  
    117117    StratconMessage.registerType(NoitStatus.class); 
    118118    StratconMessage.registerType(NoitMetric.class); 
     119    StratconMessage.registerType(NoitBundlev1.class); 
     120    StratconMessage.registerType(NoitBundlev2.class); 
    119121    StratconMessage.registerType(StratconStatement.class); 
    120122    StratconMessage.registerType(StratconQuery.class); 
  • src/java/run-iep.sh.in

    r4bb6079 r24c830d  
    1616        cglib-nodep-2.2.jar commons-pool-1.4.jar commons-dbcp-1.2.2.jar \ 
    1717        postgresql-8.3-604.jdbc3.jar rabbitmq-client-2.4.1.jar \ 
    18         commons-io-1.2.jar commons-cli-1.1.jar commons-logging-1.1.1.jar" 
     18        commons-io-1.2.jar commons-cli-1.1.jar commons-logging-1.1.1.jar \ 
     19        commons-codec-1.5.jar protobuf-java-2.4.1.jar" 
    1920 
    2021DIRS=". lib @prefix@/java/lib @prefix@/java" 
  • src/stratcon_iep.c

    r0ba1606 r24c830d  
    391391    int line_len = strlen(job->line); 
    392392    int remote_len = strlen(job->remote); 
     393    const char *toff = strchr(job->line, '\t'); 
     394    int token_off = 2; 
     395    if(toff) token_off = toff - job->line + 1; 
    393396 
    394397    job->doc_str = (char*)calloc(line_len + 1 /* \t */ + 
    395398        remote_len + 2, 1); 
    396     strncpy(job->doc_str, job->line, 2); 
     399    strncpy(job->doc_str, job->line, token_off); 
    397400    strncat(job->doc_str, job->remote, remote_len); 
    398401    strncat(job->doc_str, "\t", 1); 
    399     strncat(job->doc_str, job->line + 2, line_len - 2); 
     402    strncat(job->doc_str, job->line + token_off, line_len - token_off); 
    400403 
    401404    /* Don't need to catch error here, next submit will catch it */