summaryrefslogtreecommitdiffstats
path: root/src/Client
diff options
context:
space:
mode:
Diffstat (limited to 'src/Client')
-rw-r--r--src/Client/CommandManager.cpp16
-rw-r--r--src/Client/CommandParser.cpp1
-rw-r--r--src/Client/InformationManager.cpp4
3 files changed, 10 insertions, 11 deletions
diff --git a/src/Client/CommandManager.cpp b/src/Client/CommandManager.cpp
index ad88152..f46bdcd 100644
--- a/src/Client/CommandManager.cpp
+++ b/src/Client/CommandManager.cpp
@@ -140,7 +140,7 @@ void CommandManager::daemonCommandRequestFinished(const Common::Request &request
try {
request.getResult();
}
- catch(Common::Exception &exception) {
+ catch(Net::Exception &exception) {
Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", exception.strerror().c_str());
}
@@ -153,7 +153,7 @@ void CommandManager::daemonFSInfoRequestFinished(const Common::Request &request)
std::cout << "Host file system usage:" << std::endl;
printFSInfo(packet);
}
- catch(Common::Exception &exception) {
+ catch(Net::Exception &exception) {
Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", exception.strerror().c_str());
}
@@ -166,7 +166,7 @@ void CommandManager::daemonStatusRequestFinished(const Common::Request &request)
std::cout << "Host status:" << std::endl;
printHostStatus(packet);
}
- catch(Common::Exception &exception) {
+ catch(Net::Exception &exception) {
Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", exception.strerror().c_str());
}
@@ -178,7 +178,7 @@ void CommandManager::disconnectRequestFinished(const Common::Request &request) {
request.getResult();
disconnect = true;
}
- catch(Common::Exception &exception) {
+ catch(Net::Exception &exception) {
Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", exception.strerror().c_str());
}
@@ -191,7 +191,7 @@ void CommandManager::fsInfoRequestFinished(const Common::Request &request) {
std::cout << "Server file system usage:" << std::endl;
printFSInfo(packet);
}
- catch(Common::Exception &exception) {
+ catch(Net::Exception &exception) {
Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", exception.strerror().c_str());
}
@@ -204,7 +204,7 @@ void CommandManager::statusRequestFinished(const Common::Request &request) {
std::cout << "Server status:" << std::endl;
printHostStatus(packet);
}
- catch(Common::Exception &exception) {
+ catch(Net::Exception &exception) {
Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", exception.strerror().c_str());
}
@@ -218,7 +218,7 @@ void CommandManager::userInfoRequestFinished(const Common::Request &request) {
std::cout << " " << (unsigned long)packet["uid"] << ", " << (unsigned long)packet["gid"] << ", " << (const std::string&)packet["username"] << ", "
<< (const std::string&)packet["fullName"] << std::endl << std::endl;
}
- catch(Common::Exception &exception) {
+ catch(Net::Exception &exception) {
Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", exception.strerror().c_str());
}
@@ -244,7 +244,7 @@ void CommandManager::userListRequestFinished(const Common::Request &request) {
std::cout << std::endl;
}
- catch(Common::Exception &exception) {
+ catch(Net::Exception &exception) {
Common::Logger::logf(Common::Logger::ERROR, "An error occurred during your request: %s.", exception.strerror().c_str());
}
diff --git a/src/Client/CommandParser.cpp b/src/Client/CommandParser.cpp
index 8e55c01..1b40046 100644
--- a/src/Client/CommandParser.cpp
+++ b/src/Client/CommandParser.cpp
@@ -22,7 +22,6 @@
#include "Requests/DaemonFSInfoRequest.h"
#include "Requests/DaemonCommandRequest.h"
#include "Requests/DaemonStatusRequest.h"
-#include <Common/Exception.h>
#include <Common/Logger.h>
#include <Common/RequestManager.h>
#include <Common/Requests/FSInfoRequest.h>
diff --git a/src/Client/InformationManager.cpp b/src/Client/InformationManager.cpp
index d99791c..6c36495 100644
--- a/src/Client/InformationManager.cpp
+++ b/src/Client/InformationManager.cpp
@@ -35,7 +35,7 @@ void InformationManager::DaemonStateUpdateRequestHandler::handlePacket(const Com
Common::XmlPacket ret;
ret.setType("Error");
- ret.add("ErrorCode", Common::Exception::UNEXPECTED_PACKET);
+ ret.add("ErrorCode", Net::Exception::UNEXPECTED_PACKET);
sendPacket(ret);
@@ -94,7 +94,7 @@ void InformationManager::daemonListRequestFinished(const Common::Request &reques
daemons.insert(std::make_pair(info.getName(), info));
}
}
- catch(Common::Exception &e) {
+ catch(Net::Exception &e) {
Common::Logger::logf(Common::Logger::CRITICAL, "Host list request failed: %s", e.strerror().c_str());
}