diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-19 20:37:23 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-09-19 20:40:43 +0200 |
commit | 6708c5f296d0c80bb64ad7ba7a2e949969d35753 (patch) | |
tree | ce309859b08f92dda4f9bce8846e4c324945725d /messagebus_test | |
parent | c536a7dedb8257d9a56fb350bf24b796e26712e8 (diff) |
This add slime encoding of headers for future TLS usage,
and slime encoded body containing normal mbus payload.
Both supporting compression.
Diffstat (limited to 'messagebus_test')
-rw-r--r-- | messagebus_test/src/tests/error/cpp-client.cpp | 4 | ||||
-rw-r--r-- | messagebus_test/src/tests/error/cpp-server.cpp | 1 | ||||
-rw-r--r-- | messagebus_test/src/tests/speed/cpp-client.cpp | 1 | ||||
-rw-r--r-- | messagebus_test/src/tests/speed/cpp-server.cpp | 1 | ||||
-rw-r--r-- | messagebus_test/src/tests/trace/cpp-server.cpp | 1 | ||||
-rw-r--r-- | messagebus_test/src/tests/trace/trace.cpp | 6 |
6 files changed, 9 insertions, 5 deletions
diff --git a/messagebus_test/src/tests/error/cpp-client.cpp b/messagebus_test/src/tests/error/cpp-client.cpp index 001b0b14674..44580400e26 100644 --- a/messagebus_test/src/tests/error/cpp-client.cpp +++ b/messagebus_test/src/tests/error/cpp-client.cpp @@ -1,13 +1,11 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/messagebus/messagebus.h> -#include <vespa/messagebus/sourcesession.h> #include <vespa/messagebus/errorcode.h> #include <vespa/messagebus/testlib/simplemessage.h> -#include <vespa/messagebus/testlib/simplereply.h> #include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/rpcmessagebus.h> -#include <vespa/messagebus/sourcesessionparams.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> #include <vespa/messagebus/testlib/receptor.h> #include <vespa/fastos/app.h> diff --git a/messagebus_test/src/tests/error/cpp-server.cpp b/messagebus_test/src/tests/error/cpp-server.cpp index 68a1d0afc27..af0d6e30132 100644 --- a/messagebus_test/src/tests/error/cpp-server.cpp +++ b/messagebus_test/src/tests/error/cpp-server.cpp @@ -3,6 +3,7 @@ #include <vespa/messagebus/messagebus.h> #include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/rpcmessagebus.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> #include <vespa/messagebus/emptyreply.h> #include <vespa/messagebus/errorcode.h> #include <vespa/fastos/app.h> diff --git a/messagebus_test/src/tests/speed/cpp-client.cpp b/messagebus_test/src/tests/speed/cpp-client.cpp index d510054c0ab..437cc3ce354 100644 --- a/messagebus_test/src/tests/speed/cpp-client.cpp +++ b/messagebus_test/src/tests/speed/cpp-client.cpp @@ -3,6 +3,7 @@ #include <vespa/messagebus/messagebus.h> #include <vespa/messagebus/routing/retrytransienterrorspolicy.h> #include <vespa/messagebus/rpcmessagebus.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> #include <vespa/messagebus/testlib/simplemessage.h> #include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/testlib/simplereply.h> diff --git a/messagebus_test/src/tests/speed/cpp-server.cpp b/messagebus_test/src/tests/speed/cpp-server.cpp index ba821f19b02..ddbeac62ce2 100644 --- a/messagebus_test/src/tests/speed/cpp-server.cpp +++ b/messagebus_test/src/tests/speed/cpp-server.cpp @@ -5,6 +5,7 @@ #include <vespa/messagebus/testlib/simplereply.h> #include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/rpcmessagebus.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> #include <vespa/fastos/app.h> using namespace mbus; diff --git a/messagebus_test/src/tests/trace/cpp-server.cpp b/messagebus_test/src/tests/trace/cpp-server.cpp index 60bd55270a7..c9086ff1758 100644 --- a/messagebus_test/src/tests/trace/cpp-server.cpp +++ b/messagebus_test/src/tests/trace/cpp-server.cpp @@ -3,6 +3,7 @@ #include <vespa/messagebus/messagebus.h> #include <vespa/messagebus/testlib/simpleprotocol.h> #include <vespa/messagebus/rpcmessagebus.h> +#include <vespa/messagebus/network/rpcnetworkparams.h> #include <vespa/messagebus/emptyreply.h> #include <vespa/fastos/app.h> diff --git a/messagebus_test/src/tests/trace/trace.cpp b/messagebus_test/src/tests/trace/trace.cpp index 96759f286b8..a653c4934b3 100644 --- a/messagebus_test/src/tests/trace/trace.cpp +++ b/messagebus_test/src/tests/trace/trace.cpp @@ -1,6 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/log/log.h> -LOG_SETUP("trace_test"); + #include <vespa/vespalib/testkit/testapp.h> #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/messagebus/testlib/slobrok.h> @@ -21,6 +20,9 @@ LOG_SETUP("trace_test"); #include <vespa/messagebus/testlib/simpleprotocol.h> #include <iostream> +#include <vespa/log/log.h> +LOG_SETUP("trace_test"); + using namespace mbus; using vespalib::make_string; |