Skip to content

Commit

Permalink
Merge pull request #335 from foundriesio/detsch-fix-log-messages
Browse files Browse the repository at this point in the history
Fix some log messages
  • Loading branch information
detsch authored Jul 12, 2024
2 parents b9d679e + 5ace05c commit 13aeb6b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion apps/aklite-offline/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ int main(int argc, char** argv) {
})};

if (cmds.end() == find_it) {
LOG_ERROR << "Unsuported command: " << cmd_name << "\n";
LOG_ERROR << "Unsupported command: " << cmd_name << "\n";
print_usage();
exit(EXIT_FAILURE);
}
Expand Down
2 changes: 1 addition & 1 deletion src/api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,7 @@ class LocalLiteInstall : public LiteInstall {
reason = "Update to " + target_->filename();
}

client_->logTarget("Downloading: ", *target_);
client_->logTarget("Copying: ", *target_);

auto downloader = createOfflineDownloader();
client_->notifyDownloadStarted(*target_, reason);
Expand Down
2 changes: 1 addition & 1 deletion src/composeapp/appengine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ bool AppEngine::isAppInstalled(const App& app) const {
void AppEngine::installAppAndImages(const App& app) {
exec(boost::format{"%s --store %s --compose %s --host %s install %s"} % composectl_cmd_ % storeRoot() %
installRoot() % dockerHost() % app.uri,
"failed to installl compose app");
"failed to install compose app");
}

static bool checkAppStatus(const AppEngine::App& app, const Json::Value& status) {
Expand Down
4 changes: 2 additions & 2 deletions src/composeappmanager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,8 @@ data::InstallationResult ComposeAppManager::install(const Uptane::Target& target
}

} else {
LOG_INFO << "Apps' containers will be re-created and started just after succesfull boot on the new ostree version";
res.description += "\n# Fecthed Apps' containers will be created and started after reboot\n";
LOG_INFO << "Apps' containers will be re-created and started just after successful boot on the new ostree version";
res.description += "\n# Fetched Apps' containers will be created and started after reboot\n";
// don't prune Compose Apps' images because new images are not used by any containers and can be removed as a
// result of pruning.
prune_images = false;
Expand Down
4 changes: 2 additions & 2 deletions src/rootfstreemanager.cc
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,10 @@ void RootfsTreeManager::setRemote(const std::string& name, const std::string& ur

data::InstallationResult RootfsTreeManager::verifyBootloaderUpdate(const Uptane::Target& target) const {
if (cfg_.UpdateBlock && boot_fw_update_status_->isUpdateInProgress()) {
LOG_WARNING << "Bootlader update is in progress."
LOG_WARNING << "Bootloader update is in progress."
" A device must be rebooted to confirm and finalize the boot fw update"
" before installation of a new Target with ostree/rootfs change";
return data::InstallationResult(data::ResultCode::Numeric::kNeedCompletion, "bootlader update is in progress");
return data::InstallationResult(data::ResultCode::Numeric::kNeedCompletion, "bootloader update is in progress");
}

if (!boot_fw_update_status_->isRollbackProtectionEnabled()) {
Expand Down

0 comments on commit 13aeb6b

Please sign in to comment.