From 8d913e98e8058c6322975a858f884a769735bb43 Mon Sep 17 00:00:00 2001
From: Antonin Kral <a.kral@bobek.cz>
Date: Thu, 7 Apr 2011 07:35:46 +0200
Subject: Imported Upstream version 1.8.1

---
 s/server.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 's/server.cpp')

diff --git a/s/server.cpp b/s/server.cpp
index 9bdeede..51f30f1 100644
--- a/s/server.cpp
+++ b/s/server.cpp
@@ -77,19 +77,19 @@ namespace mongo {
     public:
         virtual ~ShardedMessageHandler() {}
 
-        virtual void process( Message& m , AbstractMessagingPort* p ) {
+        virtual void connected( AbstractMessagingPort* p ) {
+            assert( ClientInfo::get() );
+        }
+
+        virtual void process( Message& m , AbstractMessagingPort* p , LastError * le) {
             assert( p );
             Request r( m , p );
 
-            LastError * le = lastError.startRequest( m , r.getClientId() );
-            assert( le );
+            assert( le );            
+            lastError.startRequest( m , le );
 
-            if ( logLevel > 5 ) {
-                log(5) << "client id: " << hex << r.getClientId() << "\t" << r.getns() << "\t" << dec << r.op() << endl;
-            }
             try {
                 r.init();
-                setClientId( r.getClientId() );
                 r.process();
             }
             catch ( AssertionException & e ) {
@@ -119,8 +119,7 @@ namespace mongo {
         }
 
         virtual void disconnected( AbstractMessagingPort* p ) {
-            ClientInfo::disconnect( p->getClientId() );
-            lastError.disconnect( p->getClientId() );
+            // all things are thread local
         }
     };
 
-- 
cgit v1.2.3