Cleanup and style fixes in PopCon.

cms-sw · May 9, 2016 · f4a1c40 · f4a1c40
1 parent c655438
commit f4a1c40
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 39 deletions.
diff --git a/CondCore/PopCon/interface/PopCon.h b/CondCore/PopCon/interface/PopCon.h
@@ -72,18 +72,17 @@ namespace popcon {
 
     bool m_LoggingOn;
 
-    bool m_IsDestDbCheckedInQueryLog;
-
     std::string m_tag;
 
     cond::TagInfo_t m_tagInfo;
 
     cond::LogDBEntry_t m_logDBEntry;
 
     bool m_close;
+
     Time_t m_lastTill;
 
-
+    static constexpr const char* const s_version = "5.0";
   };
 
 
@@ -103,15 +102,15 @@ namespace popcon {
 
   template<typename Container>
   const std::string displayIovHelper(Container const & payloads) {
-    if (payloads.empty()) return "Nothing to transfer;";
-    std::ostringstream s;    
+    if (payloads.empty()) return std::string("Nothing to transfer;");
+    std::ostringstream s;
     // when only 1 payload is transferred; 
-    if ( payloads.size()==1)  
-      s <<"Since " << (*payloads.begin()).time <<  "; " ;
+    if ( payloads.size()==1)
+      s << "Since " << (*payloads.begin()).time <<  "; " ;
     else{
       // when more than one payload are transferred;  
-      s <<   "first payload Since " <<  (*payloads.begin()).time <<  ","
-	<< "last payload Since "  << (*payloads.rbegin()).time <<  ";" ;  
+      s << "first payload Since " <<  (*payloads.begin()).time <<  ", "
+        << "last payload Since "  << (*payloads.rbegin()).time <<  "; " ;  
     }  
     return s.str();
   }
@@ -129,12 +128,12 @@ namespace popcon {
   								 m_tagInfo,m_logDBEntry); 
     Container const & payloads = *ret.first;
 
-    if(m_LoggingOn)
-      m_dbService->setLogHeaderForRecord(m_record,source.id(),"PopCon v4.0; " + 
-					 displayIovHelper(payloads) +  ret.second);
-    //m_dbService->setLogHeaderForRecord(m_record,source.id(),"PopCon v4.0; " + 
-    //				 cond::userInfo() + displayIovHelper(payloads) +  ret.second);
-
+    if(m_LoggingOn) {
+      std::ostringstream s;
+      s << "PopCon v" << s_version << "; " << displayIovHelper(payloads) << ret.second;
+      //s << "PopCon v" << s_version << "; " << cond::userInfo() << displayIovHelper(payloads) << ret.second;
+      m_dbService->setLogHeaderForRecord(m_record,source.id(),s.str());
+    }
     displayHelper(payloads);
 
     std::for_each(payloads.begin(),payloads.end(),

diff --git a/CondCore/PopCon/src/PopCon.cc b/CondCore/PopCon/src/PopCon.cc
@@ -15,15 +15,14 @@ namespace popcon {
     m_record(pset.getParameter<std::string> ("record")),
     m_payload_name(pset.getUntrackedParameter<std::string> ("name","")),
     m_LoggingOn(pset.getUntrackedParameter< bool > ("loggingOn",true)),
-    m_IsDestDbCheckedInQueryLog( pset.getUntrackedParameter< bool >("IsDestDbCheckedInQueryLog",true)),
     m_close(pset.getUntrackedParameter< bool > ("closeIOV",false)),
     m_lastTill(pset.getUntrackedParameter< bool > ("lastTill",0))
     {
       //TODO set the policy (cfg or global configuration?)
       //Policy if corrupted data found
 
-      edm::LogInfo ("PopCon") << "This is PopCon (Populator of Condition) V4.0\n"
-			      << "Please report any problem and feature request through the savannah portal under the category conditions\n" ; 
+      edm::LogInfo ("PopCon") << "This is PopCon (Populator of Condition) v" << s_version << ".\n"
+                              << "Please report any problem and feature request through the JIRA project CMSCONDDB.\n" ; 
     }
 
   PopCon::~PopCon(){
@@ -53,30 +52,22 @@ namespace popcon {
       m_tagInfo.name = m_tag;
       m_tagInfo.size = iov.sequenceSize();
       if( m_tagInfo.size>0 ){
-	cond::Iov_t last = iov.getLast();
-	m_tagInfo.lastInterval = cond::ValidityInterval( last.since, last.till );
-	m_tagInfo.lastPayloadToken = last.payloadId;
+        cond::Iov_t last = iov.getLast();
+        m_tagInfo.lastInterval = cond::ValidityInterval( last.since, last.till );
+        m_tagInfo.lastPayloadToken = last.payloadId;
       }
 
-      //if( m_IsDestDbCheckedInQueryLog ) {
-      //m_dbService->queryLog().LookupLastEntryByTag( m_tag, connectionStr, m_logDBEntry );
-      //std::cout <<" ------ log info searched in the same db: "<< connectionStr << "------" <<std::endl;
-      //} else {
-      //m_dbService->queryLog().LookupLastEntryByTag( m_tag, m_logDBEntry );
-      //std::cout <<" ------ log info found in another db "<< "------" <<std::endl;
-      //}
-
-      edm::LogInfo ("PopCon") << "DB: " << connectionStr << "\n"
-			      << "TAG: " << m_tag 
-			      << ", last since/till: " <<  m_tagInfo.lastInterval.first
-			      << "/" << m_tagInfo.lastInterval.second
-			      << ", , size: " << m_tagInfo.size << "\n"
-			      << "Last writer: " <<  m_logDBEntry.provenance 
-			      << ", size: " << m_logDBEntry.payloadIdx+1 << std::endl;
+      edm::LogInfo ("PopCon") << "destination DB: " << connectionStr
+                              << ", target DB: " << ( m_targetConnectionString.empty() ? connectionStr : m_targetConnectionString ) << "\n"
+                              << "TAG: " << m_tag
+                              << ", last since/till: " <<  m_tagInfo.lastInterval.first
+                              << "/" << m_tagInfo.lastInterval.second
+                              << ", size: " << m_tagInfo.size << "\n" << std::endl;
     } else {
-      edm::LogInfo ("PopCon") << "DB: " << connectionStr << "\n"
-			      << "TAG: " << m_tag 
-			      << "; First writer to this new tag." << std::endl; 
+      edm::LogInfo ("PopCon") << "destination DB: " << connectionStr
+                              << ", target DB: " << ( m_targetConnectionString.empty() ? connectionStr : m_targetConnectionString ) << "\n"
+                              << "TAG: " << m_tag
+                              << "; First writer to this new tag." << std::endl;
     }
     return m_targetSession;
   }