summaryrefslogtreecommitdiff
path: root/src/mongo/util/net
diff options
context:
space:
mode:
authorAndy Schwerin <schwerin@mongodb.com>2015-04-20 18:51:35 -0400
committerAndy Schwerin <schwerin@mongodb.com>2015-04-23 15:59:58 -0400
commitc952a9396a1843aa45d6afa3c6785dec607de112 (patch)
tree8c7ba745afa4d24d7bc7c998aec713c8384bacb2 /src/mongo/util/net
parent57232d88b869b0741d95998f8ed09a96b2e7a1bc (diff)
downloadmongo-c952a9396a1843aa45d6afa3c6785dec607de112.tar.gz
SERVER-18131 Clean up LastError.
Makes LastError a decoration on Client. Removes behavior that was specific to the dbKillCursors wire protocol message into the processing for that message, and out of last error. Simplifies lifetime of LastError. It always exists on Clients, so there's no checking for its existence, and no passing it around through parts of the networking library.
Diffstat (limited to 'src/mongo/util/net')
-rw-r--r--src/mongo/util/net/message_server.h4
-rw-r--r--src/mongo/util/net/message_server_port.cpp5
2 files changed, 2 insertions, 7 deletions
diff --git a/src/mongo/util/net/message_server.h b/src/mongo/util/net/message_server.h
index 66bdec58ad7..7bb9759eeff 100644
--- a/src/mongo/util/net/message_server.h
+++ b/src/mongo/util/net/message_server.h
@@ -38,8 +38,6 @@
namespace mongo {
- struct LastError;
-
class MessageHandler {
public:
virtual ~MessageHandler() {}
@@ -53,7 +51,7 @@ namespace mongo {
* called every time a message comes in
* handler is responsible for responding to client
*/
- virtual void process( Message& m , AbstractMessagingPort* p , LastError * err ) = 0;
+ virtual void process(Message& m, AbstractMessagingPort* p) = 0;
};
class MessageServer {
diff --git a/src/mongo/util/net/message_server_port.cpp b/src/mongo/util/net/message_server_port.cpp
index 8db034fbe6e..682a7361ede 100644
--- a/src/mongo/util/net/message_server_port.cpp
+++ b/src/mongo/util/net/message_server_port.cpp
@@ -207,9 +207,6 @@ namespace {
Message m;
int64_t counter = 0;
try {
- LastError * le = new LastError();
- lastError.reset( le ); // lastError now has ownership
-
handler->connected(portWithHandler.get());
while ( ! inShutdown() ) {
@@ -227,7 +224,7 @@ namespace {
break;
}
- handler->process(m, portWithHandler.get(), le);
+ handler->process(m, portWithHandler.get());
networkCounter.hit(portWithHandler->psock->getBytesIn(),
portWithHandler->psock->getBytesOut());