From fb8d2ecb8c32821746d21f0e7b1dadcacad63741 Mon Sep 17 00:00:00 2001
From: Marco De Marco <demarco@oats.inaf.it>
Date: Fri, 31 Jan 2014 11:22:44 +0100
Subject: [PATCH] Protocol manager refactored, before test
---
src/Client.cpp | 33 +++-
src/PlainClient.cpp | 7 +-
src/ProtocolManager.cpp | 416 ++++++++++++++++++++++++----------------
src/ProtocolManager.h | 37 +++-
src/SSLClient.cpp | 7 +-
5 files changed, 318 insertions(+), 182 deletions(-)
diff --git a/src/Client.cpp b/src/Client.cpp
index f43785c..ad0b311 100644
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -188,7 +188,9 @@ void Client::startUpdateLists()
try
{
- m_protocolManager_sp->updateFileLists();
+ m_protocolManager_sp->updateNewList();
+
+ m_protocolManager_sp->updateFailedList();
writeState(Tango::ON);
writeStatus("Database loop active");
@@ -208,8 +210,19 @@ void Client::startUpdateLists()
writeStatus("Unknown error");
}
- if(readState() != Tango::ALARM && m_protocolManager_sp->hasNextFile())
+ if(readState() != Tango::ALARM &&
+ m_protocolManager_sp->hasNextNewList())
+ {
+ m_protocolManager_sp->setRecoveryMode(false);
+
+ startResolve();
+ }
+ else if(readState() != Tango::ALARM &&
+ m_protocolManager_sp->hasNextFailedList() &&
+ m_protocolManager_sp->isRecoveryTimeElapsed())
{
+ m_protocolManager_sp->setRecoveryMode(true);
+
startResolve();
}
else
@@ -435,9 +448,13 @@ void Client::onTransferCompleted(FileWrapper::SP fileWrapper_sp)
try
{
- m_protocolManager_sp->setFileTransfered(fileWrapper_sp);
+ if(!m_protocolManager_sp->getRecoveryMode())
+ m_protocolManager_sp->setNewFileTransfered(fileWrapper_sp);
+ else
+ m_protocolManager_sp->setFailedFileTransfered(fileWrapper_sp);
- if(m_protocolManager_sp->hasNextFile())
+ if(m_protocolManager_sp->hasNextNewList() ||
+ m_protocolManager_sp->hasNextFailedList())
{
startWriteRequest();
}
@@ -473,9 +490,13 @@ void Client::onTransferFailed()
try
{
- m_protocolManager_sp->setFileFailed();
+ if(!m_protocolManager_sp->getRecoveryMode())
+ m_protocolManager_sp->setNewFileFailed();
+ else
+ m_protocolManager_sp->setFailedFileFailed();
- if(m_protocolManager_sp->hasNextFile())
+ if(m_protocolManager_sp->hasNextNewList() ||
+ m_protocolManager_sp->hasNextFailedList())
{
startWriteRequest();
}
diff --git a/src/PlainClient.cpp b/src/PlainClient.cpp
index e6b5708..cea1a61 100644
--- a/src/PlainClient.cpp
+++ b/src/PlainClient.cpp
@@ -121,7 +121,12 @@ void PlainClient::startWriteRequest()
try
{
- RequestSP request_sp = m_protocolManager_sp->createRequest();
+ RequestSP request_sp;
+
+ if(!m_protocolManager_sp->getRecoveryMode())
+ request_sp = m_protocolManager_sp->createNewListRequest();
+ else
+ request_sp = m_protocolManager_sp->createFailedListRequest();
boost::uint32_t bodySize = request_sp->ByteSize();
diff --git a/src/ProtocolManager.cpp b/src/ProtocolManager.cpp
index e76bc7f..fc72bd9 100644
--- a/src/ProtocolManager.cpp
+++ b/src/ProtocolManager.cpp
@@ -46,78 +46,132 @@ void ProtocolManager::setRemoteEndpoint(std::string remoteEndpoint)
}
//==============================================================================
-// ProtocolManager::updateFileLists()
+// ProtocolManager::updateNewList()
//==============================================================================
-void ProtocolManager::updateFileLists() throw(std::runtime_error)
+void ProtocolManager::updateNewList() throw(std::runtime_error)
{
- DEBUG_STREAM << "ProtocolManager::updateFileLists()" << endl;
+ DEBUG_STREAM << "ProtocolManager::updateNewList()" << endl;
boost::posix_time::ptime m_lastTimestamp =
m_dBManager_sp->retrieveLastTimestamp();
- DEBUG_STREAM << "ProtocolManager::updateFileLists() last timestamp "
+ DEBUG_STREAM << "ProtocolManager::updateNewList() last timestamp "
<< boost::posix_time::to_simple_string(m_lastTimestamp) << endl;
m_newFileRowset_sp = m_dBManager_sp->retrieveNewFiles(m_lastTimestamp);
m_newFileRowsetIt = m_newFileRowset_sp->begin();
+}
+
+//==============================================================================
+// ProtocolManager::updateFailedList()
+//==============================================================================
+void ProtocolManager::updateFailedList() throw(std::runtime_error)
+{
+ DEBUG_STREAM << "ProtocolManager::updateFailedList()" << endl;
m_failedFileRowset_sp = m_dBManager_sp->retrieveFailedFiles();
m_failedFileRowsetIt = m_failedFileRowset_sp->begin();
+
+ m_recoveryModeTime = boost::posix_time::second_clock::local_time();
}
//==============================================================================
-// ProtocolManager::hasNextFile()
+// ProtocolManager::hasNextNewList()
//==============================================================================
-bool ProtocolManager::hasNextFile()
+bool ProtocolManager::hasNextNewList()
{
- DEBUG_STREAM << "ProtocolManager::hasNextFile()" << endl;
+ DEBUG_STREAM << "ProtocolManager::hasNextNewList()" << endl;
if(m_newFileRowset_sp &&
m_newFileRowsetIt != m_newFileRowset_sp->end())
{
- DEBUG_STREAM << "ProtocolManager::hasNextFile() from new list" << endl;
-
- m_recoveryMode = false;
+ DEBUG_STREAM << "ProtocolManager::hasNextNewList() true" << endl;
return true;
}
+ else
+ {
+ DEBUG_STREAM << "ProtocolManager::hasNextNewList() false" << endl;
+ return false;
+ }
+}
+
+//==============================================================================
+// ProtocolManager::hasNextFailedList()
+//==============================================================================
+bool ProtocolManager::hasNextFailedList()
+{
+ DEBUG_STREAM << "ProtocolManager::hasNextFailedList()" << endl;
if(m_failedFileRowset_sp &&
m_failedFileRowsetIt != m_failedFileRowset_sp->end())
{
- boost::posix_time::ptime now(boost::posix_time::second_clock::local_time());
-
- if(m_recoveryModeTime.is_not_a_date_time())
- m_recoveryModeTime = now;
-
- boost::posix_time::time_duration diff = now - m_recoveryModeTime;
-
- if(diff.total_seconds() > 30)
- {
- DEBUG_STREAM << "ProtocolManager::hasNextFile() from failed list" << endl;
- m_recoveryModeTime = now;
- m_recoveryMode = true;
- return true;
- }
- else
- {
- DEBUG_STREAM << "ProtocolManager::hasNextFile() "
- << "wait from failed list" << endl;
- }
+ DEBUG_STREAM << "ProtocolManager::hasNextFailedList() true" << endl;
+ return true;
+ }
+ else
+ {
+ DEBUG_STREAM << "ProtocolManager::hasNextFailedList() false" << endl;
+ return false;
+ }
+}
+
+//==============================================================================
+// ProtocolManager::isRecoveryTimeElapsed()
+//==============================================================================
+bool ProtocolManager::isRecoveryTimeElapsed()
+{
+ DEBUG_STREAM << "ProtocolManager::isRecoveryTimeElapsed()" << endl;
+
+ boost::posix_time::ptime now(boost::posix_time::second_clock::local_time());
+
+ if(m_recoveryModeTime.is_not_a_date_time())
+ m_recoveryModeTime = now;
+
+ boost::posix_time::time_duration diff = now - m_recoveryModeTime;
+
+ if(diff.total_seconds() > (int)m_configuration_sp->getRecoveryTime())
+ {
+ DEBUG_STREAM << "ProtocolManager::isRecoveryTimeElapsed() true" << endl;
+ return true;
+ }
+ else
+ {
+ DEBUG_STREAM << "ProtocolManager::isRecoveryTimeElapsed() false" << endl;
+ return false;
}
+}
- DEBUG_STREAM << "ProtocolManager::hasNextFile() lists empty" << endl;
+//==============================================================================
+// ProtocolManager::getRecoveryMode()
+//==============================================================================
+bool ProtocolManager::getRecoveryMode()
+{
+ DEBUG_STREAM << "ProtocolManager::getRecoveryMode()" << endl;
- m_recoveryMode = false;
- return false;
+ return m_recoveryMode;
}
//==============================================================================
-// ProtocolManager::createRequest()
+// ProtocolManager::setRecoveryMode()
//==============================================================================
-RequestSP ProtocolManager::createRequest()
+void ProtocolManager::setRecoveryMode(bool recoveryMode)
+{
+ DEBUG_STREAM << "ProtocolManager::setRecoveryMode()" << endl;
+
+ m_recoveryMode = recoveryMode;
+}
+
+//==============================================================================
+// ProtocolManager::createNewListRequest()
+//==============================================================================
+RequestSP ProtocolManager::createNewListRequest()
throw(std::logic_error, std::runtime_error)
{
- DEBUG_STREAM << "ProtocolManager::createRequest()" << endl;
+ DEBUG_STREAM << "ProtocolManager::createNewListRequest()" << endl;
+
+ if(!m_newFileRowset_sp ||
+ m_newFileRowsetIt == m_newFileRowset_sp->end())
+ throw std::runtime_error("New list not initialized or empty");
RequestSP request_sp(new Request);
@@ -127,47 +181,60 @@ RequestSP ProtocolManager::createRequest()
request_sp->set_schema(m_configuration_sp->getDatabaseSchema());
request_sp->set_table(m_configuration_sp->getDatabaseTable());
- int fileVersion;
- std::string fileName;
+ if(!m_newFileRowsetIt->get<0>())
+ throw std::invalid_argument("Empty file version found on new list");
+ int fileVersion = m_newFileRowsetIt->get<0>().get();
- if(!m_recoveryMode)
- {
- if(!m_newFileRowset_sp ||
- m_newFileRowsetIt == m_newFileRowset_sp->end())
- throw std::runtime_error("New list not initialized or empty");
+ if(!m_newFileRowsetIt->get<1>())
+ throw std::invalid_argument("Empty file name found on new list");
+ std::string fileName = m_newFileRowsetIt->get<1>().get();
- if(!m_newFileRowsetIt->get<0>())
- throw std::invalid_argument("Empty file version found on new list");
- fileVersion = m_newFileRowsetIt->get<0>().get();
+ request_sp->set_file_version(fileVersion);
+ request_sp->set_file_name(fileName);
- if(!m_newFileRowsetIt->get<1>())
- throw std::invalid_argument("Empty file name found on new list");
- fileName = m_newFileRowsetIt->get<1>().get();
+ INFO_STREAM << "ProtocolManager::createNewListRequest() file " << fileName
+ << " version " << fileVersion << " to " << m_remoteEndpoint << endl;
- INFO_STREAM << "ProtocolManager::createRequest() request new file "
- << fileName << " version " << fileVersion << endl;
- }
- else
- {
- if(!m_failedFileRowset_sp ||
- m_failedFileRowsetIt == m_failedFileRowset_sp->end())
- throw std::runtime_error("Failed list not initialized or empty");
+ if(!request_sp->IsInitialized())
+ throw std::runtime_error("Request not initialized");
- if(!m_failedFileRowsetIt->get<0>())
- throw std::invalid_argument("Empty file version found on failed list");
- fileVersion = m_failedFileRowsetIt->get<0>().get();
+ return request_sp;
+}
- if(!m_failedFileRowsetIt->get<1>())
- throw std::invalid_argument("Empty file name found on failed list");
- fileName = m_failedFileRowsetIt->get<1>().get();
+//==============================================================================
+// ProtocolManager::createFailedListRequest()
+//==============================================================================
+RequestSP ProtocolManager::createFailedListRequest()
+ throw(std::logic_error, std::runtime_error)
+{
+ DEBUG_STREAM << "ProtocolManager::createFailedListRequest()" << endl;
- INFO_STREAM << "ProtocolManager::createRequest() request failed file "
- << fileName << " version " << fileVersion << endl;
- }
+ if(!m_failedFileRowset_sp ||
+ m_failedFileRowsetIt == m_failedFileRowset_sp->end())
+ throw std::runtime_error("Failed list not initialized or empty");
+
+ RequestSP request_sp(new Request);
+
+ request_sp->set_username(m_configuration_sp->getDatabaseUsername());
+ request_sp->set_password(m_configuration_sp->getDatabasePassword());
+
+ request_sp->set_schema(m_configuration_sp->getDatabaseSchema());
+ request_sp->set_table(m_configuration_sp->getDatabaseTable());
+
+ if(!m_failedFileRowsetIt->get<0>())
+ throw std::invalid_argument("Empty file version found on failed list");
+ int fileVersion = m_failedFileRowsetIt->get<0>().get();
+
+ if(!m_failedFileRowsetIt->get<1>())
+ throw std::invalid_argument("Empty file name found on failed list");
+ std::string fileName = m_failedFileRowsetIt->get<1>().get();
request_sp->set_file_version(fileVersion);
request_sp->set_file_name(fileName);
+ INFO_STREAM << "ProtocolManager::createFailedListRequest() file " << fileName
+ << " version " << fileVersion << " to " << m_remoteEndpoint << endl;
+
if(!request_sp->IsInitialized())
throw std::runtime_error("Request not initialized");
@@ -202,7 +269,8 @@ FileWrapper::SP ProtocolManager::processResponse(ResponseSP response_sp)
boost::uint64_t fileSize = response_sp->file_size();
INFO_STREAM << "ProtocolManager::processResponse() transfer file "
- << fileName << " version " << fileVersion << " size " << fileSize << endl;
+ << fileName << " version " << fileVersion << " size " << fileSize
+ << " from " << m_remoteEndpoint << endl;
return FileWrapper::create(m_deviceImpl_p,
m_configuration_sp->getStoragePath(), filePath,
@@ -219,154 +287,166 @@ FileWrapper::SP ProtocolManager::processResponse(ResponseSP response_sp)
}
//==============================================================================
-// ProtocolManager::setFileTransfered()
+// ProtocolManager::setNewFileTransfered()
//==============================================================================
-void ProtocolManager::setFileTransfered(FileWrapper::SP fileWrapper_sp)
+void ProtocolManager::setNewFileTransfered(FileWrapper::SP fileWrapper_sp)
throw(std::logic_error, std::runtime_error)
{
- DEBUG_STREAM << "ProtocolManager::setFileTransfered()" << endl;
+ DEBUG_STREAM << "ProtocolManager::setNewFileTransfered()" << endl;
+
+ if(!m_newFileRowset_sp ||
+ m_newFileRowsetIt == m_newFileRowset_sp->end())
+ throw std::runtime_error("New list not initialized or empty");
std::string storagePath = fileWrapper_sp->getStoragePath();
std::string filePath = fileWrapper_sp->getFilePath();
- if(!m_recoveryMode)
- {
- if(!m_newFileRowset_sp ||
- m_newFileRowsetIt == m_newFileRowset_sp->end())
- throw std::runtime_error("New list not initialized or empty");
+ if(!m_newFileRowsetIt->get<0>())
+ throw std::invalid_argument("Empty file version found on new list");
+ int fileVersion = m_newFileRowsetIt->get<0>().get();
- if(!m_newFileRowsetIt->get<0>())
- throw std::invalid_argument("Empty file version found on new list");
- int fileVersion = m_newFileRowsetIt->get<0>().get();
+ if(!m_newFileRowsetIt->get<1>())
+ throw std::invalid_argument("Empty file name found on new list");
+ std::string fileName = m_newFileRowsetIt->get<1>().get();
- if(!m_newFileRowsetIt->get<1>())
- throw std::invalid_argument("Empty file name found on new list");
- std::string fileName = m_newFileRowsetIt->get<1>().get();
+ if(!m_newFileRowsetIt->get<2>())
+ throw std::invalid_argument("Empty update time found on new list");
+ std::tm currentTm = m_newFileRowsetIt->get<2>().get();
- if(!m_newFileRowsetIt->get<2>())
- throw std::invalid_argument("Empty update time found on new list");
- std::tm currentTm = m_newFileRowsetIt->get<2>().get();
+ INFO_STREAM << "ProtocolManager::setNewFileTransfered() file "
+ << fileName << " version " << fileVersion << " transfered" << endl;
- INFO_STREAM << "ProtocolManager::setFileTransfered() file "
- << fileName << " version " << fileVersion << " transfered" << endl;
+ boost::posix_time::ptime currentPtime =
+ boost::posix_time::ptime_from_tm(currentTm);
- boost::posix_time::ptime currentPtime =
- boost::posix_time::ptime_from_tm(currentTm);
+ boost::posix_time::ptime nextPtime(boost::posix_time::pos_infin);
- boost::posix_time::ptime nextPtime(boost::posix_time::pos_infin);
+ //FIXME: not incremented in case of exception!!!
+ ++m_newFileRowsetIt;
- //FIXME: not incremented in case of exception!!!
- ++m_newFileRowsetIt;
+ if(m_newFileRowsetIt != m_newFileRowset_sp->end())
+ {
+ if(!m_newFileRowsetIt->get<2>())
+ throw std::invalid_argument("Empty next update time found on new list");
+ std::tm nextTm = m_newFileRowsetIt->get<2>().get();
- if(m_newFileRowsetIt != m_newFileRowset_sp->end())
- {
- if(!m_newFileRowsetIt->get<2>())
- throw std::invalid_argument("Empty next update time found on new list");
- std::tm nextTm = m_newFileRowsetIt->get<2>().get();
+ nextPtime =boost::posix_time::ptime_from_tm(nextTm);
+ }
- nextPtime =boost::posix_time::ptime_from_tm(nextTm);
- }
+ DBManager::TransactionSP auxTransaction_sp = m_dBManager_sp->getAuxTransaction();
+ DBManager::TransactionSP mainTransaction_sp = m_dBManager_sp->getMainTransaction();
- DBManager::TransactionSP auxTransaction_sp = m_dBManager_sp->getAuxTransaction();
- DBManager::TransactionSP mainTransaction_sp = m_dBManager_sp->getMainTransaction();
+ if(nextPtime > currentPtime)
+ m_dBManager_sp->persistLastTimestamp(currentPtime);
- if(nextPtime > currentPtime)
- m_dBManager_sp->persistLastTimestamp(currentPtime);
+ m_dBManager_sp->updateNewFilePath(storagePath, filePath, fileVersion, fileName);
- m_dBManager_sp->updateNewFilePath(storagePath, filePath, fileVersion, fileName);
+ auxTransaction_sp->commit();
+ mainTransaction_sp->commit();
+}
- auxTransaction_sp->commit();
- mainTransaction_sp->commit();
- }
- else
- {
- if(!m_failedFileRowset_sp ||
- m_failedFileRowsetIt == m_failedFileRowset_sp->end())
- throw std::runtime_error("Failed list not initialized or empty");
+//==============================================================================
+// ProtocolManager::setFailedFileTransfered()
+//==============================================================================
+void ProtocolManager::setFailedFileTransfered(FileWrapper::SP fileWrapper_sp)
+ throw(std::logic_error, std::runtime_error)
+{
+ DEBUG_STREAM << "ProtocolManager::setFailedFileTransfered()" << endl;
- if(!m_failedFileRowsetIt->get<0>())
- throw std::invalid_argument("Empty file version found on failed list");
- int fileVersion = m_failedFileRowsetIt->get<0>().get();
+ if(!m_failedFileRowset_sp ||
+ m_failedFileRowsetIt == m_failedFileRowset_sp->end())
+ throw std::runtime_error("Failed list not initialized or empty");
- if(!m_failedFileRowsetIt->get<1>())
- throw std::invalid_argument("Empty file name found on failed list");
- string fileName = m_failedFileRowsetIt->get<1>().get();
+ std::string storagePath = fileWrapper_sp->getStoragePath();
+ std::string filePath = fileWrapper_sp->getFilePath();
- //FIXME: not incremented in case of exception!!!
- ++m_failedFileRowsetIt;
+ if(!m_failedFileRowsetIt->get<0>())
+ throw std::invalid_argument("Empty file version found on failed list");
+ int fileVersion = m_failedFileRowsetIt->get<0>().get();
- DBManager::TransactionSP auxTransaction_sp = m_dBManager_sp->getAuxTransaction();
- DBManager::TransactionSP mainTransaction_sp = m_dBManager_sp->getMainTransaction();
+ if(!m_failedFileRowsetIt->get<1>())
+ throw std::invalid_argument("Empty file name found on failed list");
+ string fileName = m_failedFileRowsetIt->get<1>().get();
- m_dBManager_sp->removeFailedFile(fileVersion, fileName);
+ //FIXME: not incremented in case of exception!!!
+ ++m_failedFileRowsetIt;
- m_dBManager_sp->updateNewFilePath(storagePath, filePath, fileVersion, fileName);
+ DBManager::TransactionSP auxTransaction_sp = m_dBManager_sp->getAuxTransaction();
+ DBManager::TransactionSP mainTransaction_sp = m_dBManager_sp->getMainTransaction();
- auxTransaction_sp->commit();
- mainTransaction_sp->commit();
- }
+ m_dBManager_sp->removeFailedFile(fileVersion, fileName);
+
+ m_dBManager_sp->updateNewFilePath(storagePath, filePath, fileVersion, fileName);
+
+ auxTransaction_sp->commit();
+ mainTransaction_sp->commit();
}
//==============================================================================
-// ProtocolManager::markAsFailed()
+// ProtocolManager::setNewFileFailed()
//==============================================================================
-void ProtocolManager::setFileFailed() throw(std::logic_error, std::runtime_error)
+void ProtocolManager::setNewFileFailed()
+ throw(std::logic_error, std::runtime_error)
{
- DEBUG_STREAM << "ProtocolManager::markAsFailed()" << endl;
+ DEBUG_STREAM << "ProtocolManager::setNewFileFailed()" << endl;
- if(!m_recoveryMode)
- {
- if(!m_newFileRowset_sp ||
- m_newFileRowsetIt == m_newFileRowset_sp->end())
- throw std::runtime_error("New list not initialized or empty");
+ if(!m_newFileRowset_sp ||
+ m_newFileRowsetIt == m_newFileRowset_sp->end())
+ throw std::runtime_error("New list not initialized or empty");
- if(!m_newFileRowsetIt->get<0>())
- throw std::invalid_argument("Empty file version found on new list");
- int fileVersion = m_newFileRowsetIt->get<0>().get();
+ if(!m_newFileRowsetIt->get<0>())
+ throw std::invalid_argument("Empty file version found on new list");
+ int fileVersion = m_newFileRowsetIt->get<0>().get();
- if(!m_newFileRowsetIt->get<1>())
- throw std::invalid_argument("Empty file name found on new list");
- string fileName = m_newFileRowsetIt->get<1>().get();
+ if(!m_newFileRowsetIt->get<1>())
+ throw std::invalid_argument("Empty file name found on new list");
+ string fileName = m_newFileRowsetIt->get<1>().get();
- if(!m_newFileRowsetIt->get<2>())
- throw std::invalid_argument("Empty update time found on new list");
- std::tm currentTm = m_newFileRowsetIt->get<2>().get();
+ if(!m_newFileRowsetIt->get<2>())
+ throw std::invalid_argument("Empty update time found on new list");
+ std::tm currentTm = m_newFileRowsetIt->get<2>().get();
+
+ INFO_STREAM << "ProtocolManager::setFileFailed() file "
+ << fileName << " version " << fileVersion << " transfered" << endl;
- INFO_STREAM << "ProtocolManager::setFileFailed() file "
- << fileName << " version " << fileVersion << " transfered" << endl;
+ boost::posix_time::ptime currentPtime =
+ boost::posix_time::ptime_from_tm(currentTm);
- boost::posix_time::ptime currentPtime =
- boost::posix_time::ptime_from_tm(currentTm);
+ boost::posix_time::ptime nextPtime(boost::posix_time::pos_infin);
- boost::posix_time::ptime nextPtime(boost::posix_time::pos_infin);
+ //FIXME: not incremented in case of exception!!!
+ ++m_newFileRowsetIt;
- //FIXME: not incremented in case of exception!!!
- ++m_newFileRowsetIt;
+ if(m_newFileRowsetIt != m_newFileRowset_sp->end())
+ {
+ if(!m_newFileRowsetIt->get<2>())
+ throw std::invalid_argument("Empty next update time found on new list");
+ std::tm nextTm = m_newFileRowsetIt->get<2>().get();
- if(m_newFileRowsetIt != m_newFileRowset_sp->end())
- {
- if(!m_newFileRowsetIt->get<2>())
- throw std::invalid_argument("Empty next update time found on new list");
- std::tm nextTm = m_newFileRowsetIt->get<2>().get();
+ nextPtime =boost::posix_time::ptime_from_tm(nextTm);
+ }
- nextPtime =boost::posix_time::ptime_from_tm(nextTm);
- }
+ DBManager::TransactionSP auxTransaction_sp = m_dBManager_sp->getAuxTransaction();
+ DBManager::TransactionSP mainTransaction_sp = m_dBManager_sp->getMainTransaction();
- DBManager::TransactionSP auxTransaction_sp = m_dBManager_sp->getAuxTransaction();
- DBManager::TransactionSP mainTransaction_sp = m_dBManager_sp->getMainTransaction();
+ if(nextPtime > currentPtime)
+ m_dBManager_sp->persistLastTimestamp(currentPtime);
- if(nextPtime > currentPtime)
- m_dBManager_sp->persistLastTimestamp(currentPtime);
+ m_dBManager_sp->addFailedFile(fileVersion, fileName);
- m_dBManager_sp->addFailedFile(fileVersion, fileName);
+ auxTransaction_sp->commit();
+ mainTransaction_sp->commit();
+}
- auxTransaction_sp->commit();
- mainTransaction_sp->commit();
- }
- else
- {
- ++m_failedFileRowsetIt;
- }
+//==============================================================================
+// ProtocolManager::setFailedFileFailed()
+//==============================================================================
+void ProtocolManager::setFailedFileFailed()
+ throw(std::logic_error, std::runtime_error)
+{
+ DEBUG_STREAM << "ProtocolManager::setFailedFileFailed()" << endl;
+
+ ++m_failedFileRowsetIt;
}
} //namespace
diff --git a/src/ProtocolManager.h b/src/ProtocolManager.h
index b6b5a4d..47c5918 100644
--- a/src/ProtocolManager.h
+++ b/src/ProtocolManager.h
@@ -57,16 +57,35 @@ public:
virtual void setRemoteEndpoint(std::string);
//------------------------------------------------------------------------------
-// [Public] Files list methods
+// [Public] Files lists update methods
//------------------------------------------------------------------------------
- virtual void updateFileLists() throw(std::runtime_error);
+ virtual void updateNewList() throw(std::runtime_error);
- virtual bool hasNextFile();
+ virtual void updateFailedList() throw(std::runtime_error);
+
+//------------------------------------------------------------------------------
+// [Public] Files lists handling methods
+//------------------------------------------------------------------------------
+ virtual bool hasNextNewList();
+
+ virtual bool hasNextFailedList();
+
+ virtual bool isRecoveryTimeElapsed();
+
+//------------------------------------------------------------------------------
+// [Public] Recovery mode getter and setter methods
+//------------------------------------------------------------------------------
+ virtual bool getRecoveryMode();
+
+ virtual void setRecoveryMode(bool);
//------------------------------------------------------------------------------
// [Public] Request response methods
//------------------------------------------------------------------------------
- RequestSP createRequest()
+ RequestSP createNewListRequest()
+ throw(std::logic_error, std::runtime_error);
+
+ RequestSP createFailedListRequest()
throw(std::logic_error, std::runtime_error);
FileWrapper::SP processResponse(ResponseSP)
@@ -75,10 +94,16 @@ public:
//------------------------------------------------------------------------------
// [Public] Files status methods
//------------------------------------------------------------------------------
- virtual void setFileTransfered(FileWrapper::SP)
+ virtual void setNewFileTransfered(FileWrapper::SP)
throw(std::logic_error, std::runtime_error);
- virtual void setFileFailed()
+ virtual void setFailedFileTransfered(FileWrapper::SP)
+ throw(std::logic_error, std::runtime_error);
+
+ virtual void setNewFileFailed()
+ throw(std::logic_error, std::runtime_error);
+
+ virtual void setFailedFileFailed()
throw(std::logic_error, std::runtime_error);
protected:
diff --git a/src/SSLClient.cpp b/src/SSLClient.cpp
index 62ae061..43b2a41 100644
--- a/src/SSLClient.cpp
+++ b/src/SSLClient.cpp
@@ -174,7 +174,12 @@ void SSLClient::startWriteRequest()
try
{
- RequestSP request_sp = m_protocolManager_sp->createRequest();
+ RequestSP request_sp;
+
+ if(!m_protocolManager_sp->getRecoveryMode())
+ request_sp = m_protocolManager_sp->createNewListRequest();
+ else
+ request_sp = m_protocolManager_sp->createFailedListRequest();
boost::uint32_t bodySize = request_sp->ByteSize();
--
GitLab