diff options
author | Vitaly Buka <vitalybuka@google.com> | 2016-01-21 17:15:58 -0800 |
---|---|---|
committer | Vitaly Buka <vitalybuka@google.com> | 2016-01-22 21:43:25 +0000 |
commit | 48a8669ddc2e8d785aad9ad18a5abbf8f1224fde (patch) | |
tree | f2e3ebf331594c3164f26e27f583eb77f544f507 /examples | |
parent | 50a147a0d09185e0e0f6913e2b8bc33734a54f3f (diff) | |
download | libweave-48a8669ddc2e8d785aad9ad18a5abbf8f1224fde.tar.gz |
Remove domain from weave::Error
We don't filter out errors by domain in libweave.
BUG:26071451
Change-Id: I2114450aca1c8ede71cc45f19bd8e71d3464cb73
Reviewed-on: https://weave-review.googlesource.com/2289
Reviewed-by: Alex Vakulenko <avakulenko@google.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/daemon/ledflasher/ledflasher.cc | 4 | ||||
-rw-r--r-- | examples/daemon/light/light.cc | 6 | ||||
-rw-r--r-- | examples/daemon/lock/lock.cc | 6 | ||||
-rw-r--r-- | examples/daemon/oven/oven.cc | 4 | ||||
-rw-r--r-- | examples/daemon/sample/sample.cc | 4 | ||||
-rw-r--r-- | examples/provider/curl_http_client.cc | 2 | ||||
-rw-r--r-- | examples/provider/event_http_client.cc | 4 | ||||
-rw-r--r-- | examples/provider/ssl_stream.cc | 2 | ||||
-rw-r--r-- | examples/provider/wifi_manager.cc | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/examples/daemon/ledflasher/ledflasher.cc b/examples/daemon/ledflasher/ledflasher.cc index 2e38d95..369b003 100644 --- a/examples/daemon/ledflasher/ledflasher.cc +++ b/examples/daemon/ledflasher/ledflasher.cc @@ -102,7 +102,7 @@ class LedFlasherHandler { return; } weave::ErrorPtr error; - weave::Error::AddTo(&error, FROM_HERE, "example", "invalid_parameter_value", + weave::Error::AddTo(&error, FROM_HERE, "invalid_parameter_value", "Invalid parameters"); cmd->Abort(error.get(), nullptr); } @@ -124,7 +124,7 @@ class LedFlasherHandler { return; } weave::ErrorPtr error; - weave::Error::AddTo(&error, FROM_HERE, "example", "invalid_parameter_value", + weave::Error::AddTo(&error, FROM_HERE, "invalid_parameter_value", "Invalid parameters"); cmd->Abort(error.get(), nullptr); } diff --git a/examples/daemon/light/light.cc b/examples/daemon/light/light.cc index 298fcaf..a78231f 100644 --- a/examples/daemon/light/light.cc +++ b/examples/daemon/light/light.cc @@ -215,7 +215,7 @@ class LightHandler { return; } weave::ErrorPtr error; - weave::Error::AddTo(&error, FROM_HERE, "example", "invalid_parameter_value", + weave::Error::AddTo(&error, FROM_HERE, "invalid_parameter_value", "Invalid parameters"); cmd->Abort(error.get(), nullptr); } @@ -241,7 +241,7 @@ class LightHandler { return; } weave::ErrorPtr error; - weave::Error::AddTo(&error, FROM_HERE, "example", "invalid_parameter_value", + weave::Error::AddTo(&error, FROM_HERE, "invalid_parameter_value", "Invalid parameters"); cmd->Abort(error.get(), nullptr); } @@ -275,7 +275,7 @@ class LightHandler { } weave::ErrorPtr error; - weave::Error::AddTo(&error, FROM_HERE, "example", "invalid_parameter_value", + weave::Error::AddTo(&error, FROM_HERE, "invalid_parameter_value", "Invalid parameters"); cmd->Abort(error.get(), nullptr); } diff --git a/examples/daemon/lock/lock.cc b/examples/daemon/lock/lock.cc index 0785c14..fcc6ad7 100644 --- a/examples/daemon/lock/lock.cc +++ b/examples/daemon/lock/lock.cc @@ -98,8 +98,8 @@ class LockHandler { if (!weave::StringToEnum(requested_state, &new_lock_status)) { // Invalid lock state was specified. weave::ErrorPtr error; - weave::Error::AddTo(&error, FROM_HERE, "example", - "invalid_parameter_value", "Invalid parameters"); + weave::Error::AddTo(&error, FROM_HERE, "invalid_parameter_value", + "Invalid parameters"); cmd->Abort(error.get(), nullptr); return; } @@ -114,7 +114,7 @@ class LockHandler { return; } weave::ErrorPtr error; - weave::Error::AddTo(&error, FROM_HERE, "example", "invalid_parameter_value", + weave::Error::AddTo(&error, FROM_HERE, "invalid_parameter_value", "Invalid parameters"); cmd->Abort(error.get(), nullptr); } diff --git a/examples/daemon/oven/oven.cc b/examples/daemon/oven/oven.cc index ff1c60b..daf1971 100644 --- a/examples/daemon/oven/oven.cc +++ b/examples/daemon/oven/oven.cc @@ -191,7 +191,7 @@ class OvenHandler { } weave::ErrorPtr error; - weave::Error::AddTo(&error, FROM_HERE, "example", "invalid_parameter_value", + weave::Error::AddTo(&error, FROM_HERE, "invalid_parameter_value", "Invalid parameters"); cmd->Abort(error.get(), nullptr); } @@ -215,7 +215,7 @@ class OvenHandler { } weave::ErrorPtr error; - weave::Error::AddTo(&error, FROM_HERE, "example", "invalid_parameter_value", + weave::Error::AddTo(&error, FROM_HERE, "invalid_parameter_value", "Invalid parameters"); cmd->Abort(error.get(), nullptr); } diff --git a/examples/daemon/sample/sample.cc b/examples/daemon/sample/sample.cc index f4ad3d9..7e58193 100644 --- a/examples/daemon/sample/sample.cc +++ b/examples/daemon/sample/sample.cc @@ -88,8 +88,8 @@ class SampleHandler { std::string name; if (!params.GetString("name", &name)) { weave::ErrorPtr error; - weave::Error::AddTo(&error, FROM_HERE, "example", - "invalid_parameter_value", "Name is missing"); + weave::Error::AddTo(&error, FROM_HERE, "invalid_parameter_value", + "Name is missing"); cmd->Abort(error.get(), nullptr); return; } diff --git a/examples/provider/curl_http_client.cc b/examples/provider/curl_http_client.cc index de8b3dd..2b1fac3 100644 --- a/examples/provider/curl_http_client.cc +++ b/examples/provider/curl_http_client.cc @@ -109,7 +109,7 @@ SendRequestBlocking(CurlHttpClient::Method method, ErrorPtr error; if (res != CURLE_OK) { - Error::AddTo(&error, FROM_HERE, "curl", "curl_easy_perform_error", + Error::AddTo(&error, FROM_HERE, "curl_easy_perform_error", curl_easy_strerror(res)); return {nullptr, std::move(error)}; } diff --git a/examples/provider/event_http_client.cc b/examples/provider/event_http_client.cc index fbfc6d8..0346a67 100644 --- a/examples/provider/event_http_client.cc +++ b/examples/provider/event_http_client.cc @@ -60,7 +60,7 @@ void RequestDoneCallback(evhttp_request* req, void* ctx) { if (!req) { ErrorPtr error; auto err = EVUTIL_SOCKET_ERROR(); - Error::AddToPrintf(&error, FROM_HERE, "http_client", "request_failed", + Error::AddToPrintf(&error, FROM_HERE, "request_failed", "request failed: %s", evutil_socket_error_to_string(err)); state->task_runner_->PostDelayedTask( @@ -134,7 +134,7 @@ void EventHttpClient::SendRequest(Method method, if (res >= 0) return; ErrorPtr error; - Error::AddToPrintf(&error, FROM_HERE, "http_client", "request_failed", + Error::AddToPrintf(&error, FROM_HERE, "request_failed", "request failed: %s %s", EnumToString(method).c_str(), url.c_str()); task_runner_->PostDelayedTask( diff --git a/examples/provider/ssl_stream.cc b/examples/provider/ssl_stream.cc index eea28c0..8c1a756 100644 --- a/examples/provider/ssl_stream.cc +++ b/examples/provider/ssl_stream.cc @@ -21,7 +21,7 @@ void AddSslError(ErrorPtr* error, unsigned long ssl_error_code) { ERR_load_BIO_strings(); SSL_load_error_strings(); - Error::AddToPrintf(error, location, "ssl_stream", error_code, "%s: %s", + Error::AddToPrintf(error, location, error_code, "%s: %s", ERR_lib_error_string(ssl_error_code), ERR_reason_error_string(ssl_error_code)); } diff --git a/examples/provider/wifi_manager.cc b/examples/provider/wifi_manager.cc index ed6a9fd..cad882d 100644 --- a/examples/provider/wifi_manager.cc +++ b/examples/provider/wifi_manager.cc @@ -84,7 +84,7 @@ void WifiImpl::TryToConnect(const std::string& ssid, if (base::Time::Now() >= until) { ErrorPtr error; - Error::AddTo(&error, FROM_HERE, "wifi", "timeout", + Error::AddTo(&error, FROM_HERE, "timeout", "Timeout connecting to WiFI network."); task_runner_->PostDelayedTask( FROM_HERE, base::Bind(callback, base::Passed(&error)), {}); @@ -105,7 +105,7 @@ void WifiImpl::Connect(const std::string& ssid, CHECK(!hostapd_started_); if (hostapd_started_) { ErrorPtr error; - Error::AddTo(&error, FROM_HERE, "wifi", "busy", "Running Access Point."); + Error::AddTo(&error, FROM_HERE, "busy", "Running Access Point."); task_runner_->PostDelayedTask( FROM_HERE, base::Bind(callback, base::Passed(&error)), {}); return; |