diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:53:34 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-14 19:55:14 -0400 |
| commit | e0c122119afea4c951c0c57144d26a473118c254 (patch) | |
| tree | 34a02a56f9b017201dfb721ef678c711351466d6 /lib/server/ServerStream.h | |
| parent | e0eb815b67734abd09ff41e2271630d4b2a6d760 (diff) | |
Fixup botched merge
Diffstat (limited to 'lib/server/ServerStream.h')
| -rw-r--r-- | lib/server/ServerStream.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/lib/server/ServerStream.h b/lib/server/ServerStream.h index 8625832d..a9b56169 100644 --- a/lib/server/ServerStream.h +++ b/lib/server/ServerStream.h @@ -48,8 +48,6 @@ private: ServerStream(const ServerStream &rToCopy) { } -<<<<<<< HEAD -======= std::string mConnectionDetails; @@ -59,7 +57,6 @@ protected: return mConnectionDetails; } ->>>>>>> 0.12 public: virtual const char *DaemonName() const @@ -134,13 +131,10 @@ 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) @@ -256,14 +250,9 @@ 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()) @@ -289,10 +278,7 @@ public: // Set up daemon EnterChild(); SetProcessTitle("transaction"); -<<<<<<< HEAD -======= LogConnectionDetails(mConnectionDetails); ->>>>>>> 0.12 // Memory leak test the forked process #ifdef BOX_MEMORY_LEAK_TESTING @@ -310,13 +296,9 @@ 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 { |