You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2016/10/24 17:04:12 UTC
nutch git commit: NUTH-2329 Update Slf4j logging for Java 8 and
upgrade miredot plugin version
Repository: nutch
Updated Branches:
refs/heads/master d4c924e56 -> 9092e233f
NUTH-2329 Update Slf4j logging for Java 8 and upgrade miredot plugin version
Project: http://git-wip-us.apache.org/repos/asf/nutch/repo
Commit: http://git-wip-us.apache.org/repos/asf/nutch/commit/9092e233
Tree: http://git-wip-us.apache.org/repos/asf/nutch/tree/9092e233
Diff: http://git-wip-us.apache.org/repos/asf/nutch/diff/9092e233
Branch: refs/heads/master
Commit: 9092e233f49bd6c1edbe768efd590af4bb2a4b55
Parents: d4c924e
Author: Lewis John McGibbney <le...@gmail.com>
Authored: Tue Oct 18 12:39:23 2016 -0700
Committer: Lewis John McGibbney <le...@gmail.com>
Committed: Tue Oct 18 12:39:23 2016 -0700
----------------------------------------------------------------------
ivy/ivy.xml | 4 ++--
ivy/mvn.template | 6 +++---
src/java/org/apache/nutch/fetcher/Fetcher.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nutch/blob/9092e233/ivy/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy/ivy.xml b/ivy/ivy.xml
index adc7e91..853a639 100644
--- a/ivy/ivy.xml
+++ b/ivy/ivy.xml
@@ -128,8 +128,8 @@
<dependency org="de.agilecoders.wicket" name="wicket-bootstrap-core" rev="0.9.2" conf="*->default" />
<dependency org="de.agilecoders.wicket" name="wicket-bootstrap-extensions" rev="0.9.2" conf="*->default" />
- <!-- RabbitMQ dependencies -->
- <dependency org="com.rabbitmq" name="amqp-client" rev="3.6.5" conf="*->default" />
+ <!-- RabbitMQ dependencies -->
+ <dependency org="com.rabbitmq" name="amqp-client" rev="3.6.5" conf="*->default" />
<!--global exclusion -->
<exclude module="jmxtools" />
http://git-wip-us.apache.org/repos/asf/nutch/blob/9092e233/ivy/mvn.template
----------------------------------------------------------------------
diff --git a/ivy/mvn.template b/ivy/mvn.template
index 68813fc..8e3c794 100644
--- a/ivy/mvn.template
+++ b/ivy/mvn.template
@@ -1,4 +1,4 @@
- <?xml version="1.0"?>
+<?xml version="1.0"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
@@ -125,7 +125,7 @@
<plugin>
<groupId>com.qmino</groupId>
<artifactId>miredot-plugin</artifactId>
- <version>2.0-RC2</version>
+ <version>2.0.1</version>
<executions>
<execution>
<goals>
@@ -134,7 +134,7 @@
</execution>
</executions>
<configuration>
- <organizationId>c579ca2e-c194-4a14-a7f0-f39ef4ec3c2d</organizationId>
+ <licence>cHJvamVjdHxvcmcuYXBhY2hlLm51dGNoLm51dGNofDIwMTktMTAtMzB8dHJ1ZXwtMSNNQ3dDRkJMb0FjM283ME1YRERRMkFJemY1QmxZUjAwK0FoUkJVMlJrVi81RlBQc25zMUZ2S2g0Q29weGFxZz09</licence>
<restModel>
<restFramework>
<name>jax-rs</name>
http://git-wip-us.apache.org/repos/asf/nutch/blob/9092e233/src/java/org/apache/nutch/fetcher/Fetcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/nutch/fetcher/Fetcher.java b/src/java/org/apache/nutch/fetcher/Fetcher.java
index e60b10f..17f5a93 100644
--- a/src/java/org/apache/nutch/fetcher/Fetcher.java
+++ b/src/java/org/apache/nutch/fetcher/Fetcher.java
@@ -347,7 +347,7 @@ MapRunnable<Text, CrawlDatum, Text, NutchWritable> {
additionalThreads = (availableThreads < additionalThreads ? availableThreads
: additionalThreads);
LOG.info("Has space for more threads ({} vs {} kbps) \t=> adding {} new threads",
- (bpsSinceLastCheck / 1000), (targetBandwidth / 1000), additionalThreads);
+ new Object[]{(bpsSinceLastCheck / 1000), (targetBandwidth / 1000), additionalThreads});
// activate new threads
for (int i = 0; i < additionalThreads; i++) {
FetcherThread thread = new FetcherThread(getConf(), getActiveThreads(), fetchQueues,
@@ -364,7 +364,7 @@ MapRunnable<Text, CrawlDatum, Text, NutchWritable> {
long excessBdw = bpsSinceLastCheck - targetBandwidth;
int excessThreads = Math.round(excessBdw / averageBdwPerThread);
LOG.info("Exceeding target bandwidth ({} vs {} kbps). \t=> excessThreads = {}",
- bpsSinceLastCheck / 1000, (targetBandwidth / 1000), excessThreads);
+ new Object[]{bpsSinceLastCheck / 1000, (targetBandwidth / 1000), excessThreads});
// keep at least one
if (excessThreads >= fetcherThreads.size())
excessThreads = 0;