diff options
| author | Christopher Wiley <wiley@google.com> | 2015-12-30 19:09:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-30 19:09:39 +0000 |
| commit | 333af6c80416138da1df905e50f69e7776643e17 (patch) | |
| tree | 10c96eb5bb0b904da1a0918d96347c599b7b22fb | |
| parent | 485f01334ba8cc8f96de8b69e5747f6eb79467e0 (diff) | |
| parent | ea01132806b239d47e656be2f214253a8f50d590 (diff) | |
| download | weaved-333af6c80416138da1df905e50f69e7776643e17.tar.gz | |
Use static function to create connected webserver
am: ea01132806
* commit 'ea01132806b239d47e656be2f214253a8f50d590':
Use static function to create connected webserver
| -rw-r--r-- | buffet/webserv_client.cc | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/buffet/webserv_client.cc b/buffet/webserv_client.cc index 154bc5f..4a67d75 100644 --- a/buffet/webserv_client.cc +++ b/buffet/webserv_client.cc @@ -93,23 +93,20 @@ WebServClient::WebServClient( brillo::dbus_utils::AsyncEventSequencer* sequencer, const base::Closure& server_available_callback) : server_available_callback_{server_available_callback} { - web_server_.reset(new libwebserv::Server); + web_server_ = libwebserv::Server::ConnectToServerViaDBus( + bus, buffet::dbus_constants::kServiceName, + sequencer->GetHandler("Server::Connect failed.", true), + base::Bind(&base::DoNothing), + base::Bind(&base::DoNothing)); web_server_->OnProtocolHandlerConnected( base::Bind(&WebServClient::OnProtocolHandlerConnected, weak_ptr_factory_.GetWeakPtr())); web_server_->OnProtocolHandlerDisconnected( base::Bind(&WebServClient::OnProtocolHandlerDisconnected, weak_ptr_factory_.GetWeakPtr())); - - web_server_->Connect(bus, buffet::dbus_constants::kServiceName, - sequencer->GetHandler("Server::Connect failed.", true), - base::Bind(&base::DoNothing), - base::Bind(&base::DoNothing)); } -WebServClient::~WebServClient() { - web_server_->Disconnect(); -} +WebServClient::~WebServClient() {} void WebServClient::AddHttpRequestHandler( const std::string& path, |