Add severity info to drive::EventLogger.

chrome/browser/chromeos/drive/job_scheduler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/job_scheduler.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 674 matching lines @@
 void JobScheduler::QueueJob(JobID job_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   JobEntry* job_entry = job_map_.Lookup(job_id);
   DCHECK(job_entry);
   const JobInfo& job_info = job_entry->job_info;
 
   QueueType queue_type = GetJobQueueType(job_info.job_type);
   queue_[queue_type]->Push(job_id, job_entry->context.type);
 
-  util::Log("Job queued: %s - %s", job_info.ToString().c_str(),
+  util::Log(logging::LOG_INFO,
+            "Job queued: %s - %s",
+            job_info.ToString().c_str(),
             GetQueueInfo(queue_type).c_str());
 }
 
 void JobScheduler::DoJobLoop(QueueType queue_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const int accepted_priority = GetCurrentAcceptedPriority(queue_type);
 
   // Abort all USER_INITAITED jobs when not accepted.
   if (accepted_priority < USER_INITIATED) {
@@ skipping 14 matching lines @@
   JobEntry* entry = job_map_.Lookup(job_id);
   DCHECK(entry);
 
   JobInfo* job_info = &entry->job_info;
   job_info->state = STATE_RUNNING;
   job_info->start_time = base::Time::Now();
   NotifyJobUpdated(*job_info);
 
   entry->cancel_callback = entry->task.Run();
 
-  util::Log("Job started: %s - %s",
+  util::Log(logging::LOG_INFO,
+            "Job started: %s - %s",
             job_info->ToString().c_str(),
             GetQueueInfo(queue_type).c_str());
 }
 
 int JobScheduler::GetCurrentAcceptedPriority(QueueType queue_type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const int kNoJobShouldRun = -1;
 
   // Should stop if Drive was disabled while running the fetch loop.
@@ skipping 57 matching lines @@
 bool JobScheduler::OnJobDone(JobID job_id, google_apis::GDataErrorCode error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   JobEntry* job_entry = job_map_.Lookup(job_id);
   DCHECK(job_entry);
   JobInfo* job_info = &job_entry->job_info;
   QueueType queue_type = GetJobQueueType(job_info->job_type);
   queue_[queue_type]->MarkFinished(job_id);
 
   const base::TimeDelta elapsed = base::Time::Now() - job_info->start_time;
-  util::Log("Job done: %s => %s (elapsed time: %sms) - %s",
+  bool success = (GDataToFileError(error) == FILE_ERROR_OK);
+  util::Log(success ? logging::LOG_INFO : logging::LOG_WARNING,
+            "Job done: %s => %s (elapsed time: %sms) - %s",
             job_info->ToString().c_str(),
             GDataErrorCodeToString(error).c_str(),
             base::Int64ToString(elapsed.InMilliseconds()).c_str(),
             GetQueueInfo(queue_type).c_str());
 
   // Retry, depending on the error.
   if ((error == google_apis::HTTP_SERVICE_UNAVAILABLE ||
       error == google_apis::HTTP_INTERNAL_SERVER_ERROR) &&
       job_entry->retry_count < kMaxRetryCount) {
     job_entry->cancel_callback.Reset();
@@ skipping 188 matching lines @@
   NOTREACHED();
   return FILE_QUEUE;
 }
 
 void JobScheduler::AbortNotRunningJob(JobEntry* job,
                                       google_apis::GDataErrorCode error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const base::TimeDelta elapsed = base::Time::Now() - job->job_info.start_time;
   const QueueType queue_type = GetJobQueueType(job->job_info.job_type);
-  util::Log("Job aborted: %s => %s (elapsed time: %sms) - %s",
+  util::Log(logging::LOG_INFO,
+            "Job aborted: %s => %s (elapsed time: %sms) - %s",
             job->job_info.ToString().c_str(),
             GDataErrorCodeToString(error).c_str(),
             base::Int64ToString(elapsed.InMilliseconds()).c_str(),
             GetQueueInfo(queue_type).c_str());
 
   base::Callback<void(google_apis::GDataErrorCode)> callback =
       job->abort_callback;
   queue_[GetJobQueueType(job->job_info.job_type)]->Remove(job->job_info.job_id);
   NotifyJobDone(job->job_info, error);
   job_map_.Remove(job->job_info.job_id);
@@ skipping 30 matching lines @@
     case FILE_QUEUE:
       return "FILE_QUEUE";
     case NUM_QUEUES:
       break;  // This value is just a sentinel. Should never be used.
   }
   NOTREACHED();
   return "";
 }
 
 }  // namespace drive