commit fbf2e4387eb7669379b9b7598e053923723424fd
author Vince Laviano <vlaviano@chromium.org> Fri Oct 15 17:42:58 2010
committer Vince Laviano <vlaviano@chromium.org> Fri Oct 15 17:42:58 2010
tree 06e0bad7e6be6af3c987d6a64b41fb2a9ccfa4a5
parent 23cc9cfdefd7d07e035dde0d0616ef1e9eac0de6

cashew: support additional usage API error result strings

BUG=chromium-os:7728
TEST=Manual

Change-Id: I0cbf2f95605dff132ecb7f776b1d40e1925fbe4f

Review URL: http://codereview.chromium.org/3797006

src/service.cc

diff --git a/src/service.cc b/src/service.cc
index 0735bfc..1159385 100644
--- a/src/service.cc
+++ b/src/service.cc
@@ -53,6 +53,11 @@
 // Chromium OS Usage API status values
 static const char *kCrosUsageStatusOk = "OK";
 static const char *kCrosUsageStatusError = "ERROR";
+static const char *kCrosUsageStatusMalformedRequest = "MALFORMED REQUEST";
+static const char *kCrosUsageStatusInternalError = "INTERNAL ERROR";
+static const char *kCrosUsageStatusServiceUnavailable = "SERVICE UNAVAILABLE";
+static const char *kCrosUsageStatusRequestRefused = "REQUEST REFUSED";
+static const char *kCrosUsageStatusUnknownDevice = "UNKNOWN DEVICE";
 
 Service::Service(ServiceManager * const parent,
                  DBus::Connection& connection,  // NOLINT
@@ -217,12 +222,13 @@
     return;
   }
   DLOG(INFO) << path_ << ": OnRequestComplete: status = " << status;
-  if (status != kCrosUsageStatusOk && status != kCrosUsageStatusError) {
+  if (!IsValidCrosUsageStatus(status)) {
     LOG(WARNING) << path_ << ": OnRequestComplete: invalid status: " << status;
     return;
   }
-  if (status == kCrosUsageStatusError) {
+  if (status != kCrosUsageStatusOk) {
     LOG(WARNING) << path_ << ": OnRequestComplete: status: " << status;
+    OnCrosUsageErrorResult(status);
     return;
   }
 
@@ -569,4 +575,24 @@
   }
 }
 
+bool Service::IsValidCrosUsageStatus(const std::string& status) const {
+  if (status == kCrosUsageStatusOk ||
+      status == kCrosUsageStatusError ||
+      status == kCrosUsageStatusMalformedRequest ||
+      status == kCrosUsageStatusInternalError ||
+      status == kCrosUsageStatusServiceUnavailable ||
+      status == kCrosUsageStatusRequestRefused ||
+      status == kCrosUsageStatusUnknownDevice) {
+    return true;
+  }
+  return false;
+}
+
+void Service::OnCrosUsageErrorResult(const std::string& status) {
+  DLOG(WARNING) << path_ << ": OnCrosUsageErrorResult: " << status;
+  // TODO(vlaviano): take action based on which specific error status string
+  // we've received (e.g., we could adjust the update timer interval, or
+  // disable the timer entirely).
+}
+
 }  // namespace cashew

src/service.h

diff --git a/src/service.h b/src/service.h
index a63434e..c1d7857 100644
--- a/src/service.h
+++ b/src/service.h
@@ -190,6 +190,12 @@
     // NOTE: this does not delete usage url (it's considered service state)
     void DeleteCarrierState();
 
+    // does |status| contain a valid usage API status result string?
+    bool IsValidCrosUsageStatus(const std::string& status) const;
+
+    // usage API request returned an error result
+    void OnCrosUsageErrorResult(const std::string& status);
+
     DISALLOW_COPY_AND_ASSIGN(Service);
 };