From 38eb6f56fc79030eead1c27d87d54bbded26f94d Mon Sep 17 00:00:00 2001 From: kaetemi Date: Wed, 8 Aug 2012 12:27:03 +0200 Subject: [PATCH] Changed: #1440 Put the actual project and plugin values into the metadata storage request for appending errors --HG-- branch : build_pipeline_v3 --- .../tools/pipeline/service/module_pipeline_master.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/nel/tools/pipeline/service/module_pipeline_master.cpp b/code/nel/tools/pipeline/service/module_pipeline_master.cpp index 429738b13..bfe779bba 100644 --- a/code/nel/tools/pipeline/service/module_pipeline_master.cpp +++ b/code/nel/tools/pipeline/service/module_pipeline_master.cpp @@ -512,15 +512,18 @@ public: TSlaveMap::iterator slaveIt = m_Slaves.find(sender); if (slaveIt == m_Slaves.end()) { nlerror("Received 'slaveLoggedToolError' from unknown slave at '%s'", sender->getModuleName().c_str()); m_Slaves.erase(sender); /*m_SlavesMutex.unlock();*/ return; } CSlave *slave = slaveIt->second; - - // TODO + + CBuildTaskInfo *task = m_BuildTaskQueue.getTaskInfo(slave->ActiveTaskId); + CProcessPluginInfo pluginInfo; + g_PipelineWorkspace->getProcessPlugin(pluginInfo, task->ProcessPluginId); + CFileError fe; fe.MasterTime = CTime::getSecondsSince1970(); fe.Level = (TError)type; fe.Message = error; fe.Time = time; - fe.Project = "[TODO:PROJECT]"; - fe.Plugin = "[TODO:PLUGIN]"; + fe.Project = task->ProjectName;; + fe.Plugin = pluginInfo.Handler; CMetadataStorage::appendError(fe, CMetadataStorage::getErrorPath(unMacroPath(macroPath))); notifyTerminalTaskMessage(slave->ActiveTaskId, (TError)type, macroPath, time, error);