From 8cc89676d7a2fd1f73ea3c609009fe1ff4491932 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sat, 10 Mar 2012 11:13:00 +0100 Subject: [PATCH] Added: #1440 Some comments --HG-- branch : build_pipeline_v3 --- code/nel/tools/pipeline/service/module_pipeline_slave.cpp | 5 +++-- code/nel/tools/pipeline/service/pipeline_workspace.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/nel/tools/pipeline/service/module_pipeline_slave.cpp b/code/nel/tools/pipeline/service/module_pipeline_slave.cpp index eb82d51c6..1ac1cf658 100644 --- a/code/nel/tools/pipeline/service/module_pipeline_slave.cpp +++ b/code/nel/tools/pipeline/service/module_pipeline_slave.cpp @@ -48,6 +48,7 @@ using namespace NLNET; namespace PIPELINE { #define PIPELINE_INFO_SLAVE_RELOAD_SHEETS "SLAVE_RELOAD_SHEETS" +#define PIPELINE_ERROR_SHEETS_CRC32_FAILED "Failed sheets CRC32. Sheets were modified inbetween launching services. This causes newly loaded services to be out of sync. Not allowed. Reload the sheets from the master service, and restart this slave service" enum TRequestState { @@ -111,7 +112,7 @@ public: // TODO: AUTHENTICATE OR GATEWAY SECURITY? CModulePipelineMasterProxy master(sender); if (!g_PipelineWorkspace->loadCRC32()) - nlerror("Failed sheets CRC32. Sheets were modified inbetween launching services. This causes newly loaded services to be out of sync. Not allowed"); + nlerror(PIPELINE_ERROR_SHEETS_CRC32_FAILED); sendMasterAvailablePlugins(&master); } @@ -147,7 +148,7 @@ public: { m_ReloadSheetsState = REQUEST_NONE; if (!g_PipelineWorkspace->loadCRC32()) - nlerror("Failed sheets CRC32. Sheets were modified inbetween launching services. This causes newly loaded services to be out of sync. Not allowed"); + nlerror(PIPELINE_ERROR_SHEETS_CRC32_FAILED); sendMasterAvailablePlugins(m_Master); m_Master->slaveReloadedSheets(this); CInfoFlags::getInstance()->removeFlag(PIPELINE_INFO_SLAVE_RELOAD_SHEETS); diff --git a/code/nel/tools/pipeline/service/pipeline_workspace.h b/code/nel/tools/pipeline/service/pipeline_workspace.h index 5d9da1be8..e7534b082 100644 --- a/code/nel/tools/pipeline/service/pipeline_workspace.h +++ b/code/nel/tools/pipeline/service/pipeline_workspace.h @@ -83,7 +83,7 @@ class CPipelineWorkspace protected: NLGEORGES::UFormLoader *m_FormLoader; NLMISC::CRefPtr m_Form; - std::vector > m_Plugins; + std::vector > m_Plugins; // TODO: CRC32 VERIFICATION ON PLUGINS SHEETS! std::map m_Projects; uint32 m_ChangedReference; uint32 m_FileSizeReference;