| Index: branches/lucene-search-2.1/src/org/wikimedia/lsearch/search/UpdateThread.java |
| — | — | @@ -447,13 +447,16 @@ |
| 448 | 448 | rsyncPath = config.getString("Rsync","path","/usr/bin/rsync"); |
| 449 | 449 | rsyncParams = config.getString("Rsync","params",""); |
| 450 | 450 | forceLocalDeployment = config.getBoolean("Search","forceLocalDeployment"); |
| 451 | | - for(String indexpart : config.getArray("Search","forceRedirect")){ |
| 452 | | - try{ |
| 453 | | - // make sure these indexes are actually valid index names |
| 454 | | - IndexId iid = IndexId.get(indexpart); |
| 455 | | - forceRedirect.add(iid.toString()); |
| 456 | | - } catch(RuntimeException e){ |
| 457 | | - log.warn("Ignoring force redirect index "+indexpart+" since it doesn't exist."); |
| | 451 | + String[] forceRedirectValue = config.getArray("Search","forceRedirect"); |
| | 452 | + if(forceRedirectValue != null){ |
| | 453 | + for(String indexpart : forceRedirectValue){ |
| | 454 | + try{ |
| | 455 | + // make sure these indexes are actually valid index names |
| | 456 | + IndexId iid = IndexId.get(indexpart); |
| | 457 | + forceRedirect.add(iid.toString()); |
| | 458 | + } catch(RuntimeException e){ |
| | 459 | + log.warn("Ignoring force redirect index "+indexpart+" since it doesn't exist."); |
| | 460 | + } |
| 458 | 461 | } |
| 459 | 462 | } |
| 460 | 463 | deleteOldUpdates = config.getBoolean("Search","deleteOldUpdates"); |
| Index: branches/lucene-search-2.1/build.xml |
| — | — | @@ -11,6 +11,8 @@ |
| 12 | 12 | <property name="jar.name" value="LuceneSearch.jar"/> |
| 13 | 13 | <property name="include" value="src/** lib/** sql/** test-data/** webinterface/** *-example *.txt lsearch* build.xml scripts/* VERSION configure build update resources/** test/**"/> |
| 14 | 14 | <property name="include.src" value="src/** sql/** build.xml scripts/* webinterface/* VERSION configure build update test/**"/> |
| | 15 | + <property name="include.bin" value="*.log4j *.txt config.inc template/**"/> |
| | 16 | + <property name="include.sh" value="configure build update lsearchd"/> |
| 15 | 17 | |
| 16 | 18 | <property file="${basedir}/hostname"/> |
| 17 | 19 | |
| — | — | @@ -104,7 +106,8 @@ |
| 105 | 107 | <delete file="${dist}/${binary.name}.tar"/> |
| 106 | 108 | <delete file="${dist}/${binary.name}.tar.gz"/> |
| 107 | 109 | <tar tarfile="${dist}/${binary.name}.tar"> |
| 108 | | - <tarfileset prefix="${binary.name}" dir="." includes="${jar.name} ${include}" excludes="src/ test-data/ lib/ resources/"/> |
| | 110 | + <tarfileset prefix="${pack.name}" dir="." includes="${jar.name} ${include.bin}" excludes="template/backup/**"/> |
| | 111 | + <tarfileset prefix="${pack.name}" mode="755" dir="." includes="${include.sh}"/> |
| 109 | 112 | </tar> |
| 110 | 113 | |
| 111 | 114 | <gzip zipfile="${dist}/${binary.name}.tar.gz" src="${dist}/${binary.name}.tar"/> |