XrdCl: Display pid in the log message if set

xrootd · Feb 13, 2015 · ab1a8f3 · ab1a8f3
1 parent a5b6309
commit ab1a8f3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/XrdCl/XrdClLog.cc b/src/XrdCl/XrdClLog.cc
@@ -148,7 +148,9 @@ namespace XrdCl
     while( (line = tok.GetLine()) )
     {
       out << "[" << now << "][" << LogLevelToString( level ) << "]";
-      out << "[" << TopicToString( topic ) << "] " << line << std::endl;
+      out << "[" << TopicToString( topic ) << "]";
+      if(pPid) out << "[" << std::setw(5) << pPid << "]";
+      out << " " << line << std::endl;
     }
 
     pOutput->Write( out.str() );

diff --git a/src/XrdCl/XrdClLog.hh b/src/XrdCl/XrdClLog.hh
@@ -120,7 +120,7 @@ namespace XrdCl
       //------------------------------------------------------------------------
       //! Constructor
       //------------------------------------------------------------------------
-      Log(): pLevel( NoMsg ), pTopicMaxLength( 18 )
+      Log(): pLevel( NoMsg ), pTopicMaxLength( 18 ), pPid(0)
       {
         pOutput = new LogOutCerr();
         int maxMask = (int)DumpMsg+1;
@@ -298,6 +298,14 @@ namespace XrdCl
 #endif
       }
 
+      //------------------------------------------------------------------------
+      //! Set pid
+      //------------------------------------------------------------------------
+      void SetPid(pid_t pid)
+      {
+        pPid = pid;
+      }
+
     private:
       typedef std::map<uint64_t, std::string> TopicMap;
       std::string LogLevelToString( LogLevel level );
@@ -313,6 +321,7 @@ namespace XrdCl
       LogOut     *pOutput;
       TopicMap    pTopicMap;
       uint32_t    pTopicMaxLength;
+      pid_t       pPid;
   };
 }