Author: rwesten
Date: Fri Jan 18 22:46:57 2013
New Revision: 1435393
URL: http://svn.apache.org/viewvc?rev=1435393&view=rev
Log:
minor: added some info level loggings
Modified:
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
Modified:
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java?rev=1435393&r1=1435392&r2=1435393&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
(original)
+++
stanbol/trunk/commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/SolrServerAdapter.java
Fri Jan 18 22:46:57 2013
@@ -16,7 +16,23 @@
*/
package org.apache.stanbol.commons.solr;
-import static org.apache.stanbol.commons.solr.SolrConstants.*;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_CORE_DATA_DIR;
+import static org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_CORE_DIR;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_CORE_INDEX_DIR;
+import static org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_CORE_NAME;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_CORE_RANKING;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_CORE_SCHEMA;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_CORE_SERVER_ID;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_CORE_SOLR_CONF;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_SERVER_CORES;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_SERVER_DIR;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_SERVER_NAME;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_SERVER_PUBLISH_REST;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_SERVER_RANKING;
+import static
org.apache.stanbol.commons.solr.SolrConstants.PROPERTY_SOLR_XML_NAME;
+import static org.apache.stanbol.commons.solr.SolrConstants.SOLR_CONFIG_NAME;
+import static org.apache.stanbol.commons.solr.SolrConstants.SOLR_SCHEMA_NAME;
+import static org.apache.stanbol.commons.solr.SolrConstants.SOLR_XML_NAME;
import static org.osgi.framework.Constants.SERVICE_ID;
import java.io.File;
@@ -33,7 +49,6 @@ import java.util.Map;
import java.util.Set;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathFactory;
import org.apache.commons.io.FilenameUtils;
import org.apache.solr.core.CloseHook;
@@ -188,10 +203,6 @@ public class SolrServerAdapter {
File solrCof = new File(solrDir,parsedServerProperties.getSolrXml());
ClassLoader classLoader = updateContextClassLoader();
try {
- log.info(">> +++++++++++++++++++++++");
- XPathFactory.newInstance();
- log.info(">> {}",org.xml.sax.InputSource.class.getClassLoader());
- log.info(">> +++++++++++++++++++++++");
container.load(solrDir.getAbsolutePath(), solrCof);
} finally {
Thread.currentThread().setContextClassLoader(classLoader);
@@ -240,6 +251,7 @@ public class SolrServerAdapter {
* @param name the name of the core to remove
*/
public void removeCore(String name){
+ log.info("Remove Core {} on CoreContainer
{}",name,serverProperties.getServerName());
SolrCore core = server.remove(name);
if(core != null){
CoreRegistration reg = registrations.remove(name);
@@ -263,6 +275,7 @@ public class SolrServerAdapter {
*/
public void reloadCore(String name) throws ParserConfigurationException,
IOException, SAXException {
//try to reload
+ log.info("Reload Core {} on CoreContainer
{}",name,serverProperties.getServerName());
ClassLoader classLoader = updateContextClassLoader();
try {
//TODO: what happens if the core with 'name' is no longer present?
@@ -316,6 +329,8 @@ public class SolrServerAdapter {
* @param core2 the second core to swap
*/
public void swap(String core1,String core2){
+ log.info("Swap Core {} with Core {}on CoreContainer {}",
+ new Object[]{core1,core2, serverProperties.getServerName()});
//swap the cores
//TODO: what happens if one/both cores are no longer present?
server.swap(core1, core2);
@@ -340,6 +355,7 @@ public class SolrServerAdapter {
public ServiceReference registerCore(SolrCoreProperties parsedCoreConfig)
throws ParserConfigurationException, IOException, SAXException{
SolrCoreProperties coreConfig = parsedCoreConfig.clone();
String coreName = coreConfig.getCoreName();
+ log.info("Register Core {} to CoreContainer
{}",coreName,serverProperties.getServerName());
if(coreName == null){
coreName = server.getDefaultCoreName();
}
Modified:
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java?rev=1435393&r1=1435392&r2=1435393&view=diff
==============================================================================
---
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
(original)
+++
stanbol/trunk/commons/solr/managed/src/main/java/org/apache/stanbol/commons/solr/managed/impl/ManagedSolrServerImpl.java
Fri Jan 18 22:46:57 2013
@@ -978,6 +978,7 @@ public class ManagedSolrServerImpl imple
@Override
public boolean unavailable(String resource) {
+ log.info("IndexArchive {} unavailable ...",resource);
for(String indexName : managedCores.getIndexNames(resource)){
IndexMetadata metadata =
managedCores.getIndexMetadata(indexName);
if(metadata != null){ //may be removed in the meantime
@@ -1037,6 +1038,7 @@ public class ManagedSolrServerImpl imple
@Override
public boolean available(String resourceName, InputStream is) {
+ log.info("IndexArchive {} available ...",resourceName);
ArchiveInputStream ais;
try {
ais = ManagementUtils.getArchiveInputStream(resourceName, is);
@@ -1116,6 +1118,9 @@ public class ManagedSolrServerImpl imple
if(desiredState == null){
throw new IllegalArgumentException("The parsed desired
ManagedIndexState MUST NOT be NULL");
}
+ log.info("Update Request for {} (server: {}, desired state: {},
from Archive: {})",
+ new Object[]{metadata.getIndexName(), metadata.getServerName(),
+ desiredState.name(), metadata.getArchive()});
switch (desiredState) {
case ACTIVE:
if(ais == null){
