diff options
| author | Stefan Boberg <[email protected]> | 2025-03-11 19:34:33 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2025-03-11 19:34:33 +0100 |
| commit | bbb2fa12518523b7cb1b73b614f08b76699cc92c (patch) | |
| tree | b1f30c68fe304e3d6d28336c4e391db34d7ade8c /src | |
| parent | change ProgressBar so it doesn't use printf (diff) | |
| download | zen-bbb2fa12518523b7cb1b73b614f08b76699cc92c.tar.xz zen-bbb2fa12518523b7cb1b73b614f08b76699cc92c.zip | |
Misc changes to make logging more compact
also introduces ZEN_CLOUD_STORAGE to make it easier to alter product name once it's settled
Diffstat (limited to 'src')
| -rw-r--r-- | src/zen/cmds/builds_cmd.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/zen/cmds/builds_cmd.cpp b/src/zen/cmds/builds_cmd.cpp index 56c3c3c4f..e683740df 100644 --- a/src/zen/cmds/builds_cmd.cpp +++ b/src/zen/cmds/builds_cmd.cpp @@ -50,6 +50,8 @@ ZEN_THIRD_PARTY_INCLUDES_END #define EXTRA_VERIFY 0 +#define ZEN_CLOUD_STORAGE "Cloud Storage" + namespace zen { namespace { static std::atomic<bool> AbortFlag = false; @@ -7238,20 +7240,19 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) std::string StorageName; if (!m_BuildsUrl.empty()) { - ZEN_CONSOLE("Downloading '{}' to '{}' from cloud endpoint {}. SessionId: '{}'. Namespace '{}', Bucket '{}', BuildId '{}'", + ZEN_CONSOLE("Downloading Build '{}' to '{}' from {}. SessionId: '{}'. Namespace '{}', Bucket '{}'", BuildId, m_Path, m_BuildsUrl, Http.GetSessionId(), m_Namespace, - m_Bucket, - BuildId); + m_Bucket); Storage = CreateJupiterBuildStorage(Log(), Http, StorageStats, m_Namespace, m_Bucket, m_Path / ZenTempStorageFolderName); - StorageName = "Cloud DDC"; + StorageName = ZEN_CLOUD_STORAGE; } else if (!m_StoragePath.empty()) { - ZEN_CONSOLE("Downloading '{}' to '{}' from folder {}. BuildId '{}'", BuildId, m_Path, m_StoragePath, BuildId); + ZEN_CONSOLE("Downloading Build '{}' to '{}' from folder {}", BuildId, m_Path, m_StoragePath); Storage = CreateFileBuildStorage(m_StoragePath, StorageStats, false, DefaultLatency, DefaultDelayPerKBSec); StorageName = fmt::format("Disk {}", m_StoragePath.stem()); } @@ -7333,7 +7334,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) std::string StorageName; if (!m_BuildsUrl.empty()) { - ZEN_CONSOLE("Downloading {} to '{}' from cloud endpoint {}. SessionId: '{}'. Namespace '{}', Bucket '{}'", + ZEN_CONSOLE("Downloading {} to '{}' from {}. SessionId: '{}'. Namespace '{}', Bucket '{}'", FormatArray<std::string>(m_BuildIds, " "sv), m_Path, m_BuildsUrl, @@ -7341,11 +7342,11 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) m_Namespace, m_Bucket); Storage = CreateJupiterBuildStorage(Log(), Http, StorageStats, m_Namespace, m_Bucket, m_Path / ZenTempStorageFolderName); - StorageName = "Cloud DDC"; + StorageName = ZEN_CLOUD_STORAGE; } else if (!m_StoragePath.empty()) { - ZEN_CONSOLE("Downloading {}'to '{}' from folder {}", FormatArray<std::string>(m_BuildIds, " "sv), m_Path, m_StoragePath); + ZEN_CONSOLE("Downloading {}'to '{}' from folder '{}'", FormatArray<std::string>(m_BuildIds, " "sv), m_Path, m_StoragePath); Storage = CreateFileBuildStorage(m_StoragePath, StorageStats, false, DefaultLatency, DefaultDelayPerKBSec); StorageName = fmt::format("Disk {}", m_StoragePath.stem()); } @@ -7427,7 +7428,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) m_Bucket, BuildId); Storage = CreateJupiterBuildStorage(Log(), Http, StorageStats, m_Namespace, m_Bucket, m_Path / ZenTempStorageFolderName); - StorageName = "Cloud DDC"; + StorageName = ZEN_CLOUD_STORAGE; } else if (!m_StoragePath.empty()) { @@ -7716,7 +7717,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) m_Bucket, BuildId); Storage = CreateJupiterBuildStorage(Log(), Http, StorageStats, m_Namespace, m_Bucket, m_Path / ZenTempStorageFolderName); - StorageName = "Cloud DDC"; + StorageName = ZEN_CLOUD_STORAGE; } else if (!m_StoragePath.empty()) { @@ -7783,7 +7784,7 @@ BuildsCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv) m_Bucket, BuildId); Storage = CreateJupiterBuildStorage(Log(), Http, StorageStats, m_Namespace, m_Bucket, m_Path / ZenTempStorageFolderName); - StorageName = "Cloud DDC"; + StorageName = ZEN_CLOUD_STORAGE; } else if (!m_StoragePath.empty()) { |