Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #9235 from lioncash/ui-log
UICommon: Migrate logging over to fmt
  • Loading branch information
lioncash committed Nov 9, 2020
2 parents 72997c1 + 52f2fad commit 43e2f0e
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions Source/Core/UICommon/AutoUpdate.cpp
Expand Up @@ -164,24 +164,24 @@ void AutoUpdateChecker::CheckForUpdate()
auto resp = req.Get(url);
if (!resp)
{
ERROR_LOG(COMMON, "Auto-update request failed");
ERROR_LOG_FMT(COMMON, "Auto-update request failed");
return;
}
std::string contents(reinterpret_cast<char*>(resp->data()), resp->size());
INFO_LOG(COMMON, "Auto-update JSON response: %s", contents.c_str());
const std::string contents(reinterpret_cast<char*>(resp->data()), resp->size());
INFO_LOG_FMT(COMMON, "Auto-update JSON response: {}", contents);

picojson::value json;
std::string err = picojson::parse(json, contents);
const std::string err = picojson::parse(json, contents);
if (!err.empty())
{
ERROR_LOG(COMMON, "Invalid JSON received from auto-update service: %s", err.c_str());
ERROR_LOG_FMT(COMMON, "Invalid JSON received from auto-update service: {}", err);
return;
}
picojson::object obj = json.get<picojson::object>();

if (obj["status"].get<std::string>() != "outdated")
{
INFO_LOG(COMMON, "Auto-update status: we are up to date.");
INFO_LOG_FMT(COMMON, "Auto-update status: we are up to date.");
return;
}

Expand Down Expand Up @@ -229,9 +229,8 @@ void AutoUpdateChecker::TriggerUpdate(const AutoUpdateChecker::NewVersionInforma
#endif

// Run the updater!
std::string command_line = MakeUpdaterCommandLine(updater_flags);

INFO_LOG(COMMON, "Updater command line: %s", command_line.c_str());
const std::string command_line = MakeUpdaterCommandLine(updater_flags);
INFO_LOG_FMT(COMMON, "Updater command line: {}", command_line);

#ifdef _WIN32
STARTUPINFO sinfo = {sizeof(sinfo)};
Expand All @@ -245,12 +244,12 @@ void AutoUpdateChecker::TriggerUpdate(const AutoUpdateChecker::NewVersionInforma
}
else
{
ERROR_LOG(COMMON, "Could not start updater process: error=%d", GetLastError());
ERROR_LOG_FMT(COMMON, "Could not start updater process: error={}", GetLastError());
}
#else
if (popen(command_line.c_str(), "r") == nullptr)
{
ERROR_LOG(COMMON, "Could not start updater process: error=%d", errno);
ERROR_LOG_FMT(COMMON, "Could not start updater process: error={}", errno);
}
#endif

Expand Down

0 comments on commit 43e2f0e

Please sign in to comment.