Lubuntu/ci-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Lubuntu:b82181d3f320cee777333b77f22336f026e91996
Branches Tags
Lubuntu:main
...
compare: Lubuntu:94f5e376d4c6c0711010cf155fe480b5dba83cb3
Branches Tags
Lubuntu:main

2 Commits
b82181d3f3 ... 94f5e376d4

Author SHA1 Message Date
Simon Quigley
94f5e376d4 Don't include warning: ignoring deletion of file in logs 2025-01-28 12:22:18 -06:00
Simon Quigley
9c53398fc9 Less calls to functions with locks 2025-01-28 12:22:03 -06:00
2 changed files with 33 additions and 16 deletions
Show Stats Expand all files Collapse all files

48
cpp/ci_logic.cpp
View File

@ -581,23 +581,39 @@ std::vector<std::shared_ptr<PackageConf>> CiLogic::get_config(const std::string
: (a->package->name > b->package->name); : (a->package->name > b->package->name);
} }
} else if (sort_by == "build_status") { } else if (sort_by == "build_status") {
if (a->successful_task_count() != b->successful_task_count()) { {
return (order == "asc") int a_successful_task_count = a->successful_task_count();
? (a->successful_task_count() < b->successful_task_count()) int b_successful_task_count = b->successful_task_count();
: (a->successful_task_count() > b->successful_task_count()); if (a_successful_task_count != b_successful_task_count) {
} else if (a->successful_or_pending_task_count() != b->successful_or_pending_task_count()) { return (order == "asc")
return (order == "asc") ? (a_successful_task_count < b_successful_task_count)
? (a->successful_or_pending_task_count() < b->successful_or_pending_task_count()) : (a_successful_task_count > b_successful_task_count);
: (a->successful_or_pending_task_count() > b->successful_or_pending_task_count()); }
} else if (a->successful_or_queued_task_count() != b->successful_or_queued_task_count()) {
return (order == "asc")
? (a->successful_or_queued_task_count() < b->successful_or_queued_task_count())
: (a->successful_or_queued_task_count() > b->successful_or_queued_task_count());
} else {
return (order == "asc")
? (a->total_task_count() < b->total_task_count())
: (a->total_task_count() > b->total_task_count());
} }
{
int a_successful_or_pending_task_count = a->successful_or_pending_task_count();
int b_successful_or_pending_task_count = b->successful_or_pending_task_count();
if (a_successful_or_pending_task_count != b_successful_or_pending_task_count) {
return (order == "asc")
? (a_successful_or_pending_task_count < b_successful_or_pending_task_count)
: (a_successful_or_pending_task_count > b_successful_or_pending_task_count);
}
}
{
int a_successful_or_queued_task_count = a->successful_or_queued_task_count();
int b_successful_or_queued_task_count = b->successful_or_queued_task_count();
if (a_successful_or_queued_task_count != b_successful_or_queued_task_count) {
return (order == "asc")
? (a_successful_or_queued_task_count < b_successful_or_queued_task_count)
: (a_successful_or_queued_task_count > b_successful_or_queued_task_count);
}
}
return (order == "asc")
? (a->total_task_count() < b->total_task_count())
: (a->total_task_count() > b->total_task_count());
} }
// if invalid sort_by // if invalid sort_by
return false; return false;

1
cpp/common.h
View File

@ -40,6 +40,7 @@ public:
std::unique_lock lock(lock_); std::unique_lock lock(lock_);
std::string log_str = str.ends_with('\n') ? str : str + '\n'; std::string log_str = str.ends_with('\n') ? str : str + '\n';
if (str.empty() || last_data_str == log_str) { return; } if (str.empty() || last_data_str == log_str) { return; }
else if (str.contains("dpkg-source: warning: ignoring deletion of file")) { return; }
data += std::format("[{}] {}", get_current_utc_time("%Y-%m-%dT%H:%M:%SZ"), log_str); data += std::format("[{}] {}", get_current_utc_time("%Y-%m-%dT%H:%M:%SZ"), log_str);
last_data_str = log_str; last_data_str = log_str;
} }