summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2016-08-23 08:42:41 +0200
committerHarald Musum <musum@yahoo-inc.com>2016-08-23 08:42:41 +0200
commit95d93e89c0afa88ebf733477284228067eb7f952 (patch)
treebe39bec28226076b18b17884ecc7c8b22eaa8724
parent7cf5e0d341d3de4a87fd83275e5bca6adefdcc26 (diff)
Minor fixes to file distributor log messages
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java4
-rw-r--r--fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java2
-rw-r--r--filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java
index 04dc8356eec..38ba9d646b4 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/Mode.java
@@ -6,11 +6,11 @@ import java.util.Set;
/**
*
- * Different modes the config proxy can be running in.
+ * The mode the config proxy can be running with.
*
* 'default' mode is requesting config from server, serving from cache only when known config
* and no new config having been sent from server. When in 'memorycache' mode, there is no connection
- * to another config source, the proxy only serves from (memory) cache.
+ * to a config source, the proxy serves from memory cache only.
*
* @author hmusum
*/
diff --git a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java
index 8bbb0817be8..e396f5d8647 100644
--- a/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java
+++ b/fileacquirer/src/main/java/com/yahoo/filedistribution/fileacquirer/FileAcquirerImpl.java
@@ -146,7 +146,7 @@ class FileAcquirerImpl implements FileAcquirer {
Request request = new Request("waitFor");
request.parameters().add(new StringValue(fileReference.value()));
- log.log(LogLevel.DEBUG, "InvokeSync waitFor " + fileReference + " with waiting time " + timeout + timeUnit);
+ log.log(LogLevel.DEBUG, "InvokeSync waitFor " + fileReference + " with waiting time " + timeout + " " + timeUnit.name().toLowerCase());
target.invokeSync(request, timer.timeLeft(TimeUnit.SECONDS));
if (request.checkReturnTypes("s")) {
diff --git a/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp b/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp
index e58165f1f0f..5d6478c8259 100644
--- a/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp
+++ b/filedistribution/src/vespa/filedistribution/rpc/filedistributorrpc.cpp
@@ -240,7 +240,7 @@ Server::waitFor(FRT_RPCRequest* request) {
queueRequest(fileReference, request);
}
} catch (const FileDoesNotExistException&) {
- LOG(warning, "Recieved a request for a file reference that does not exist in zookeeper.");
+ LOG(warning, "Received a request for a file reference that does not exist in zookeeper.");
request->SetError(RPCErrorCodes::baseFileProviderErrorCode + FileProvider::FileReferenceDoesNotExist,
"No such file reference");
request->Return();