Author: snagel
Date: Sat Jul 5 21:42:20 2014
New Revision: 1608136
URL: http://svn.apache.org/r1608136
Log:
NUTCH-1776 Log incorrect plugin.folder file path
Modified:
nutch/branches/2.x/CHANGES.txt
nutch/branches/2.x/src/java/org/apache/nutch/plugin/PluginManifestParser.java
nutch/branches/2.x/src/java/org/apache/nutch/plugin/PluginRepository.java
nutch/trunk/CHANGES.txt
nutch/trunk/src/java/org/apache/nutch/plugin/PluginManifestParser.java
nutch/trunk/src/java/org/apache/nutch/plugin/PluginRepository.java
Modified: nutch/branches/2.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1608136&r1=1608135&r2=1608136&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Sat Jul 5 21:42:20 2014
@@ -2,6 +2,8 @@ Nutch Change Log
Current Development
+* NUTCH-1776 Log incorrect plugin.folder file path (Diaa via snagel)
+
* NUTCH-1566 bin/nutch to allow whitespace in paths (tejasp, snagel)
* NUTCH-1605 MIME type detector recognizes xlsx as zip file (snagel)
Modified:
nutch/branches/2.x/src/java/org/apache/nutch/plugin/PluginManifestParser.java
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/plugin/PluginManifestParser.java?rev=1608136&r1=1608135&r2=1608136&view=diff
==============================================================================
---
nutch/branches/2.x/src/java/org/apache/nutch/plugin/PluginManifestParser.java
(original)
+++
nutch/branches/2.x/src/java/org/apache/nutch/plugin/PluginManifestParser.java
Sat Jul 5 21:42:20 2014
@@ -133,6 +133,9 @@ public class PluginManifestParser {
} catch (UnsupportedEncodingException e) {
}
directory = new File(path);
+ } else if (!directory.exists()) {
+ LOG.warn("Plugins: directory not found: " + name);
+ return null;
}
return directory;
}
Modified:
nutch/branches/2.x/src/java/org/apache/nutch/plugin/PluginRepository.java
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/plugin/PluginRepository.java?rev=1608136&r1=1608135&r2=1608136&view=diff
==============================================================================
--- nutch/branches/2.x/src/java/org/apache/nutch/plugin/PluginRepository.java
(original)
+++ nutch/branches/2.x/src/java/org/apache/nutch/plugin/PluginRepository.java
Sat Jul 5 21:42:20 2014
@@ -71,6 +71,10 @@ public class PluginRepository {
PluginManifestParser manifestParser = new PluginManifestParser(this.conf,
this);
Map<String, PluginDescriptor> allPlugins = manifestParser
.parsePluginFolder(pluginFolders);
+ if (allPlugins.isEmpty()) {
+ LOG.warn("No plugins found on paths of property plugin.folders=\"{}\"",
+ conf.get("plugin.folders"));
+ }
Pattern excludes = Pattern.compile(conf.get("plugin.excludes", ""));
Pattern includes = Pattern.compile(conf.get("plugin.includes", ""));
Map<String, PluginDescriptor> filteredPlugins = filter(excludes, includes,
Modified: nutch/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1608136&r1=1608135&r2=1608136&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Sat Jul 5 21:42:20 2014
@@ -2,6 +2,8 @@ Nutch Change Log
Nutch Current Development
+* NUTCH-1776 Log incorrect plugin.folder file path (Diaa via snagel)
+
* NUTCH-1566 bin/nutch to allow whitespace in paths (tejasp, snagel)
* NUTCH-1605 MIME type detector recognizes xlsx as zip file (snagel)
Modified: nutch/trunk/src/java/org/apache/nutch/plugin/PluginManifestParser.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/plugin/PluginManifestParser.java?rev=1608136&r1=1608135&r2=1608136&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/plugin/PluginManifestParser.java
(original)
+++ nutch/trunk/src/java/org/apache/nutch/plugin/PluginManifestParser.java Sat
Jul 5 21:42:20 2014
@@ -134,6 +134,9 @@ public class PluginManifestParser {
} catch (UnsupportedEncodingException e) {
}
directory = new File(path);
+ } else if (!directory.exists()) {
+ LOG.warn("Plugins: directory not found: " + name);
+ return null;
}
return directory;
}
Modified: nutch/trunk/src/java/org/apache/nutch/plugin/PluginRepository.java
URL:
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/plugin/PluginRepository.java?rev=1608136&r1=1608135&r2=1608136&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/plugin/PluginRepository.java
(original)
+++ nutch/trunk/src/java/org/apache/nutch/plugin/PluginRepository.java Sat Jul
5 21:42:20 2014
@@ -74,6 +74,10 @@ public class PluginRepository {
PluginManifestParser manifestParser = new PluginManifestParser(this.conf,
this);
Map<String, PluginDescriptor> allPlugins = manifestParser
.parsePluginFolder(pluginFolders);
+ if (allPlugins.isEmpty()) {
+ LOG.warn("No plugins found on paths of property plugin.folders=\"{}\"",
+ conf.get("plugin.folders"));
+ }
Pattern excludes = Pattern.compile(conf.get("plugin.excludes", ""));
Pattern includes = Pattern.compile(conf.get("plugin.includes", ""));
Map<String, PluginDescriptor> filteredPlugins = filter(excludes, includes,
