Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7a92fd8 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by android-build-merger
Browse files

Merge "Revert "init: warn slow action"" am: 431c4895 am: ea516950

am: 6133e645

Change-Id: I736f5ca11284bf9470a6591019c12d45c1f8ff3b
parents 378b3882 6133e645
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -118,16 +118,14 @@ void Action::ExecuteCommand(const Command& command) const {
    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";
    }
}