Merge branch 'trigmessagesvc_mt' into 'master'

athenaHLT: Fix creation of worker directories and MessageSvc format

See merge request atlas/athena!20257

HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py

@@ -35,7 +35,7 @@ def setupMessageSvc():
    MessageSvc = svcMgr.MessageSvc
    MessageSvc.OutputLevel = theApp.OutputLevel
 
-   MessageSvc.Format       = "%t  % F%35W%S%7W%R%T %0W%M"
+   MessageSvc.Format       = "%t  % F%35W%S%4W%e%s%7W%R%T %0W%M"
 
    # Message suppression
    MessageSvc.enableSuppression    = False

HLT/Trigger/TrigControl/TrigServices/src/HltEventLoopMgr.cxx

 /*
-  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 // Trigger includes
@@ -557,8 +557,15 @@ StatusCode HltEventLoopMgr::hltUpdateAfterFork(const ptree& /*pt*/)
   // Nothing happens if the online TrigMonTHistSvc is used as there are no output files.
   boost::filesystem::path worker_dir = boost::filesystem::absolute("athenaHLT_workers");
   worker_dir /= m_applicationName.value();
+  // Delete worker directory if it exists already
+  if ( boost::filesystem::exists(worker_dir) ) {
+    if ( !boost::filesystem::remove_all(worker_dir) ) {
+      ATH_MSG_FATAL("Cannot delete previous worker directory " << worker_dir);
+      return StatusCode::FAILURE;
+    }
+  }
   if ( !boost::filesystem::create_directories(worker_dir) ) {
-    ATH_MSG_ERROR("Cannot create worker directory " << worker_dir);
+    ATH_MSG_FATAL("Cannot create worker directory " << worker_dir);
     return StatusCode::FAILURE;
   }
   ATH_CHECK(m_ioCompMgr->io_update_all(worker_dir.string()));