diff --git a/src/cpp/model/ErrorList.h b/src/cpp/model/ErrorList.h index 543ade706..b0f9be4be 100644 --- a/src/cpp/model/ErrorList.h +++ b/src/cpp/model/ErrorList.h @@ -58,6 +58,7 @@ public: ~SendErrorMessage(); virtual int run(); + const char* getResourceType() const { return "SendErrorMessage"; }; protected: diff --git a/src/cpp/model/ModelBase.cpp b/src/cpp/model/ModelBase.cpp index 627be5bb3..c5882c7d2 100644 --- a/src/cpp/model/ModelBase.cpp +++ b/src/cpp/model/ModelBase.cpp @@ -7,6 +7,9 @@ ModelInsertTask::ModelInsertTask(Poco::AutoPtr model) : UniLib::controller::CPUTask(ServerConfig::g_CPUScheduler), mModel(model) { +#ifdef _UNI_LIB_DEBUG + setName(model->getTableName()); +#endif } int ModelInsertTask::run() diff --git a/src/cpp/model/Session.h b/src/cpp/model/Session.h index d839aa68f..d982b3b21 100644 --- a/src/cpp/model/Session.h +++ b/src/cpp/model/Session.h @@ -124,7 +124,11 @@ class WriteEmailVerification : public UniLib::controller::CPUTask { public: WriteEmailVerification(Poco::AutoPtr user, Poco::UInt64 emailVerificationCode, UniLib::controller::CPUSheduler* cpuScheduler, size_t taskDependenceCount = 0) - : UniLib::controller::CPUTask(cpuScheduler, taskDependenceCount), mUser(user), mEmailVerificationCode(emailVerificationCode) {} + : UniLib::controller::CPUTask(cpuScheduler, taskDependenceCount), mUser(user), mEmailVerificationCode(emailVerificationCode) { +#ifdef _UNI_LIB_DEBUG + setName(user->getEmail()); +#endif + } virtual const char* getResourceType() const { return "WriteEmailVerification"; }; virtual int run(); @@ -139,7 +143,10 @@ class WritePassphraseIntoDB : public UniLib::controller::CPUTask { public: WritePassphraseIntoDB(int userId, const std::string& passphrase) - : mUserId(userId), mPassphrase(passphrase) {} + : mUserId(userId), mPassphrase(passphrase) { +#ifdef _UNI_LIB_DEBUG + setName(std::to_string(userId).data()); +#endif} virtual int run(); diff --git a/src/cpp/model/User.cpp b/src/cpp/model/User.cpp index 708030f87..8b2614084 100644 --- a/src/cpp/model/User.cpp +++ b/src/cpp/model/User.cpp @@ -84,6 +84,9 @@ int UserWriteIntoDB::run() UserWriteKeysIntoDB::UserWriteKeysIntoDB(UniLib::controller::TaskPtr parent, Poco::AutoPtr user, bool savePrivKey) : UniLib::controller::CPUTask(1), mUser(user), mSavePrivKey(savePrivKey) { +#ifdef _UNI_LIB_DEBUG + setName(user->getEmail()); +#endif if (strcmp(parent->getResourceType(), "UserGenerateKeys") != 0) { throw Poco::Exception("given TaskPtr isn't UserGenerateKeys"); } @@ -152,7 +155,9 @@ int UserWriteKeysIntoDB::run() UserWriteCryptoKeyHashIntoDB::UserWriteCryptoKeyHashIntoDB(Poco::AutoPtr user, int dependencieCount/* = 0*/) : UniLib::controller::CPUTask(ServerConfig::g_CPUScheduler, dependencieCount), mUser(user) { - +#ifdef _UNI_LIB_DEBUG + setName(user->getEmail()); +#endif } int UserWriteCryptoKeyHashIntoDB::run() diff --git a/src/cpp/model/User.h b/src/cpp/model/User.h index 9e6a5a78d..f277cba6b 100644 --- a/src/cpp/model/User.h +++ b/src/cpp/model/User.h @@ -140,7 +140,11 @@ class UserCreateCryptoKey : public UniLib::controller::CPUTask { public: UserCreateCryptoKey(Poco::AutoPtr user, const std::string& password, UniLib::controller::CPUSheduler* cpuScheduler) - : UniLib::controller::CPUTask(cpuScheduler), mUser(user), mPassword(password) {} + : UniLib::controller::CPUTask(cpuScheduler), mUser(user), mPassword(password) { +#ifdef _UNI_LIB_DEBUG + setName(user->getEmail()); +#endif + } virtual int run(); virtual const char* getResourceType() const { return "UserCreateCryptoKey"; }; @@ -154,7 +158,11 @@ class UserGenerateKeys : public UniLib::controller::CPUTask { public: UserGenerateKeys(Poco::AutoPtr user, const std::string& passphrase) - : mUser(user), mPassphrase(passphrase) {} + : mUser(user), mPassphrase(passphrase) { +#ifdef _UNI_LIB_DEBUG + setName(user->getEmail()); +#endif + } ~UserGenerateKeys() { @@ -173,7 +181,11 @@ class UserWriteIntoDB : public UniLib::controller::CPUTask { public: UserWriteIntoDB(Poco::AutoPtr user, UniLib::controller::CPUSheduler* cpuScheduler, size_t taskDependenceCount = 0) - : UniLib::controller::CPUTask(cpuScheduler, taskDependenceCount), mUser(user) {} + : UniLib::controller::CPUTask(cpuScheduler, taskDependenceCount), mUser(user) { +#ifdef _UNI_LIB_DEBUG + setName(user->getEmail()); +#endif + } virtual int run(); virtual const char* getResourceType() const { return "UserWriteIntoDB"; }; diff --git a/src/cpp/tasks/SendEmailTask.cpp b/src/cpp/tasks/SendEmailTask.cpp index 1de239853..63c572e44 100644 --- a/src/cpp/tasks/SendEmailTask.cpp +++ b/src/cpp/tasks/SendEmailTask.cpp @@ -7,7 +7,6 @@ SendEmailTask::SendEmailTask(Poco::Net::MailMessage* mailMessage, UniLib::controller::CPUSheduler* cpuScheduler, size_t additionalTaskDependenceCount/* = 0*/) : UniLib::controller::CPUTask(cpuScheduler, additionalTaskDependenceCount+1), mMailMessage(mailMessage) { - } SendEmailTask::~SendEmailTask() diff --git a/src/cpp/tasks/Task.h b/src/cpp/tasks/Task.h index b4e05ef80..b52417c89 100644 --- a/src/cpp/tasks/Task.h +++ b/src/cpp/tasks/Task.h @@ -33,6 +33,7 @@ //#include "UniversumLib.h" +#define _UNI_LIB_DEBUG #include "Poco/AutoPtr.h" #include "Poco/Mutex.h"