Author: rwesten
Date: Fri Dec 13 06:32:18 2013
New Revision: 1550654
URL: http://svn.apache.org/r1550654
Log:
minor: improved logging, changed some log levels and removed duplicate calls to
unregisterEngine form updateEngineRegsitration - no functional changes (related
to (already resolved) STANBOL-1128)
Modified:
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/IndexConfiguration.java
Modified:
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java?rev=1550654&r1=1550653&r2=1550654&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
(original)
+++
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/FstLinkingEngineComponent.java
Fri Dec 13 06:32:18 2013
@@ -535,6 +535,7 @@ public class FstLinkingEngineComponent {
* @param server the SolrServer (or <code>null</code>
*/
protected void updateEngineRegistration(ServiceReference reference,
SolrServer server) {
+ log.info(" ... updateEngineRegistration for {}:
{}",getClass().getSimpleName(), engineName);
if(reference != null && server == null){
server = solrServerTracker.getService(reference);
}
@@ -545,7 +546,7 @@ public class FstLinkingEngineComponent {
synchronized (this) { //init one after the other in case of multiple
calls
SolrCore core;
IndexConfiguration indexConfig; // the indexConfig build by this
call
- try {
+ try { //try to init - finally unregisterEngine
if(bundleContext == null){ //already deactivated
return; //NOTE: unregistering is done in finally block
}
@@ -560,6 +561,7 @@ public class FstLinkingEngineComponent {
core = null;
}
if(core == null){ //no SolrCore
+ log.info(" - SolrCore not yet present");
return; //NOTE: unregistering is done in finally block
} //else - we do have a SolrCore
//File fstDir = new File(dataDir,"fst");
@@ -580,18 +582,15 @@ public class FstLinkingEngineComponent {
indexConfig.setSkipAltTokens(skipAltTokensConfig);
}
//create a new searcher for creating FSTs
- boolean foundCorpus;
- try {
- foundCorpus = indexConfig.activate();
- }catch (RuntimeException e) { //in case of any excpetion
- unregisterEngine(); //unregister current engine and clean
up
- throw e; //re-throw
- }
- if(!foundCorpus){
+ if(!indexConfig.activate()){
unregisterEngine(); //unregister current engine and clean
up
- throw new IllegalStateException("Processing of the FST
configuration " +
- "was not successfull for any language. See WARN
level loggings " +
- "for more details!");
+ log.error("Processing of the FST configuration was not
successfull "
+ + "for any language. See WARN level loggings for more
details!");
+ log.error(" ... FstLinkingEnigne wiht name {} will not be
registered!"
+ + "Please check the FST config of the engine
corresponds with "
+ + "available fields in the configured SolrCore {}
(dir: {})",
+ new Object []{engineName, core.getName(),
+ core.getCoreDescriptor().getInstanceDir()});
} else { //some FST corpora initialised
if(log.isInfoEnabled()){ //log the initialised languages
Set<String> langSet = new
HashSet<String>(indexConfig.getCorpusLanguages());
@@ -606,7 +605,7 @@ public class FstLinkingEngineComponent {
}
} finally {
//in any case (even an Exception) ensure that the current
- //engine registration is unregistered and the currentyl used
+ //engine registration is unregistered and the currently used
//SolrCore is unregistered!
unregisterEngine();
}
@@ -633,6 +632,7 @@ public class FstLinkingEngineComponent {
String[] services = new String [] {
EnhancementEngine.class.getName(),
ServiceProperties.class.getName()};
+ log.info(" ... register {}: {}",
engine.getClass().getSimpleName(),engineName);
this.engineRegistration =
bundleContext.registerService(services,engine, engineMetadata);
this.solrServerReference = reference;
this.solrCore = core;
@@ -680,6 +680,7 @@ public class FstLinkingEngineComponent {
//use local copies for method calls to avoid concurrency issues
ServiceRegistration engineRegistration = this.engineRegistration;
if(engineRegistration != null){
+ log.info(" ... unregister Lucene FSTLinkingEngine {}",engineName);
engineRegistration.unregister();
this.engineRegistration = null; //reset the field
}
@@ -737,6 +738,7 @@ public class FstLinkingEngineComponent {
*/
@Deactivate
protected void deactivate(ComponentContext ctx) {
+ log.info(" ... deactivate {}: {}",getClass().getSimpleName(),
engineName);
if(solrServerTracker != null){
//closing the tracker will also cause registered engines to be
//unregistered as service (see #updateEngineRegistration())
Modified:
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/IndexConfiguration.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/IndexConfiguration.java?rev=1550654&r1=1550653&r2=1550654&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/IndexConfiguration.java
(original)
+++
stanbol/trunk/enhancement-engines/lucenefstlinking/src/main/java/org/apache/stanbol/enhancer/engines/lucenefstlinking/IndexConfiguration.java
Fri Dec 13 06:32:18 2013
@@ -399,7 +399,7 @@ public class IndexConfiguration {
if(fstDirectory == null){
fstDirectory = new File(index.getDataDir(),"fst");
}
- log.info("> process FST config for {} (FST dir: {})", index.getName(),
+ log.debug("> process FST config for {} (FST dir: {})", index.getName(),
fstDirectory.getAbsolutePath());
//init the fstDirectory
if(fstDirectory.isFile()){
@@ -411,7 +411,7 @@ public class IndexConfiguration {
IndexSchema schema = index.getLatestSchema();
boolean foundCorpus = false;
//(0) get basic parameters of the default configuration
- log.info(" - default config");
+ log.debug(" - default config");
Map<String,String> defaultParams = fstConfig.getDefaultParameters();
String fstName = defaultParams.get(IndexConfiguration.PARAM_FST);
String indexField = defaultParams.get(IndexConfiguration.PARAM_FIELD);
