openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

metricsd: Update weave command APIs 

Weave has changed some of D-Bus APIs and metrics needs to be updated
accrdingly. Command::Done is replaced with Complete(), Command::Abort
now takes error code and error messages, Command::category is removed
and Command::status is renamed to Command::state

Change-Id: Ifbfd6d852f4a328168e28484d1152a24b8c8b42b
This commit is contained in:
Alex Vakulenko 2015-10-09 08:18:35 -07:00
parent 23fe7be8d6
commit 35f8963825
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
metricsd/metrics_daemon.cc
View File

@ -326,7 +326,7 @@ void MetricsDaemon::OnShutdown(int* return_code) {
}
void MetricsDaemon::OnWeaveCommand(CommandProxy* command) {
if (command->category() != "metrics" || command->status() != "queued") {
if (command->state() != "queued") {
return;
}
@ -342,24 +342,26 @@ void MetricsDaemon::OnEnableMetrics(CommandProxy* command) {
if (base::WriteFile(metrics_directory_.Append(metrics::kConsentFileName),
"", 0) != 0) {
PLOG(ERROR) << "Could not create the consent file.";
command->Abort(nullptr);
command->Abort("metrics_error", "Could not create the consent file",
nullptr);
return;
}
NotifyStateChanged();
command->Done(nullptr);
command->Complete({}, nullptr);
}
void MetricsDaemon::OnDisableMetrics(CommandProxy* command) {
if (!base::DeleteFile(metrics_directory_.Append(metrics::kConsentFileName),
false)) {
PLOG(ERROR) << "Cound not delete the consent file.";
command->Abort(nullptr);
PLOG(ERROR) << "Could not delete the consent file.";
command->Abort("metrics_error", "Could not delete the consent file",
nullptr);
return;
}
NotifyStateChanged();
command->Done(nullptr);
command->Complete({}, nullptr);
}
void MetricsDaemon::NotifyStateChanged() {