diff options
Diffstat (limited to 'lib/server/ServerStream.h')
| -rw-r--r-- | lib/server/ServerStream.h | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/lib/server/ServerStream.h b/lib/server/ServerStream.h index e49dbcbe..8625832d 100644 --- a/lib/server/ServerStream.h +++ b/lib/server/ServerStream.h @@ -48,6 +48,18 @@ private: ServerStream(const ServerStream &rToCopy) { } +<<<<<<< HEAD +======= + + std::string mConnectionDetails; + +protected: + const std::string& GetConnectionDetails() + { + return mConnectionDetails; + } + +>>>>>>> 0.12 public: virtual const char *DaemonName() const @@ -122,6 +134,13 @@ public: protected: virtual void NotifyListenerIsReady() { } +<<<<<<< HEAD +======= + virtual void LogConnectionDetails(std::string details) + { + BOX_NOTICE("Handling incoming connection from " << details); + } +>>>>>>> 0.12 public: virtual void Run2(bool &rChildExit) @@ -237,8 +256,14 @@ public: { // Get the incoming connection // (with zero wait time) +<<<<<<< HEAD std::string logMessage; std::auto_ptr<StreamType> connection(psocket->Accept(0, &logMessage)); +======= + std::auto_ptr<StreamType> connection( + psocket->Accept(0, + &mConnectionDetails)); +>>>>>>> 0.12 // Was there one (there should be...) if(connection.get()) @@ -264,6 +289,10 @@ public: // Set up daemon EnterChild(); SetProcessTitle("transaction"); +<<<<<<< HEAD +======= + LogConnectionDetails(mConnectionDetails); +>>>>>>> 0.12 // Memory leak test the forked process #ifdef BOX_MEMORY_LEAK_TESTING @@ -281,7 +310,13 @@ public: } // Log it +<<<<<<< HEAD BOX_NOTICE("Message from child process " << pid << ": " << logMessage); +======= + BOX_TRACE("Forked child process " << pid << + " to handle connection from " << + mConnectionDetails); +>>>>>>> 0.12 } else { |