Merge "Revert "init: warn slow action"" am: 431c489568 am: ea516950fb am: 6133e64575
am: d7a92fd874
Change-Id: I3eda3dc7d6dc48466a953d731ea27d735f798c29
diff --git a/init/action.cpp b/init/action.cpp
index a12f225..ed88f6d 100644
--- a/init/action.cpp
+++ b/init/action.cpp
@@ -118,16 +118,14 @@
Timer t;
int result = command.InvokeFunc();
- double duration_ms = t.duration() * 1000;
- // Any action longer than 50ms will be warned to user as slow operation
- if (duration_ms > 50.0 ||
- android::base::GetMinimumLogSeverity() <= android::base::DEBUG) {
+ // TODO: this should probably be changed to "if (failed || took a long time)"...
+ if (android::base::GetMinimumLogSeverity() <= android::base::DEBUG) {
std::string trigger_name = BuildTriggersString();
std::string cmd_str = command.BuildCommandString();
std::string source = command.BuildSourceString();
LOG(INFO) << "Command '" << cmd_str << "' action=" << trigger_name << source
- << " returned " << result << " took " << duration_ms << "ms.";
+ << " returned " << result << " took " << t.duration() << "s";
}
}