From: Junghyun Yeon Date: Wed, 11 Aug 2021 02:05:48 +0000 (+0900) Subject: Implement RscHandler X-Git-Tag: submit/tizen/20210811.093352~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1f171337b5faccb044b4ef95e7b2f6f3d2f7758;p=platform%2Fcore%2Fappfw%2Fpkgmgr-tool.git Implement RscHandler Change-Id: I90707c66551d8c52745f7ea4e2b66d074606d2b9 Signed-off-by: Junghyun Yeon --- diff --git a/src/rsc-copy/src/request_handler_invoker.cc b/src/rsc-copy/src/request_handler_invoker.cc index d9d0ad4..3c3cd16 100644 --- a/src/rsc-copy/src/request_handler_invoker.cc +++ b/src/rsc-copy/src/request_handler_invoker.cc @@ -38,11 +38,6 @@ RequestHandlerInvoker::RequestHandlerInvoker( } bool RequestHandlerInvoker::Validate() { - if (!option_.Validate()) { - LOG(ERROR) << "Parameter validation failed"; - return false; - } - if (handler_ == nullptr) { LOG(ERROR) << "Failed to initialize handler"; return false; @@ -63,7 +58,10 @@ bool RequestHandlerInvoker::Execute() { if (handler_ == nullptr) return false; - return handler_->Execute(); + if (handler_->Execute() != ErrorType::ERROR_NONE) + return false; + + return true; } const std::string RequestHandlerInvoker::GetHandlerType() const { diff --git a/src/rsc-copy/src/rsc_handler.cc b/src/rsc-copy/src/rsc_handler.cc index 9c64fbd..b954e50 100644 --- a/src/rsc-copy/src/rsc_handler.cc +++ b/src/rsc-copy/src/rsc_handler.cc @@ -19,17 +19,16 @@ #include #include "include/event_signal_sender.hh" +#include "include/logging.hh" #include "include/param_checker.hh" #include "include/request_handler_invoker.hh" namespace rsc_handler { bool RscHandler::Init(int argc, char* argv[]) { - std::cout << "RscHandler::Init" << std::endl; - rsc_handler::ParamChecker option(argc, argv); if (!option.Validate()) { - // TODO(jungh.yeon) : error logs + LOG(ERROR) << "Invalid argument has given"; return false; } @@ -37,9 +36,9 @@ bool RscHandler::Init(int argc, char* argv[]) { signal.SetPkgID(option.GetPkgID()); signal.SetReqType(option.GetRequestType()); - rsc_handler::RequestHandlerInvoker handler(option, signal); - if (!handler.Validate()) { - // TODO(jungh.yeon) : error logs + handler_.reset(new rsc_handler::RequestHandlerInvoker(option, signal)); + if (!handler_->Validate()) { + LOG(ERROR) << "Failed to initialize request handler"; return false; } @@ -47,9 +46,7 @@ bool RscHandler::Init(int argc, char* argv[]) { } bool RscHandler::Run() { - std::cout << "RscHandler::Run" << std::endl; - - return true; + return handler_->Execute(); } } // namespace rsc_handler