Browse Source

Fix: Useless exception print on user-cancellation. Add a missing cancellation point

default_compile_flags
vector-of-bool 3 years ago
parent
commit
50afb22ab5
2 changed files with 5 additions and 0 deletions
  1. +1
    -0
      src/dds/build/plan/compile_exec.cpp
  2. +4
    -0
      src/dds/util/parallel.cpp

+ 1
- 0
src/dds/build/plan/compile_exec.cpp View File

@@ -251,6 +251,7 @@ bool dds::detail::compile_all(const ref_vector<const compile_file_plan>& compile
update_deps_info(neo::into(env.db), info);
}

cancellation_point();
// Return whether or not there were any failures.
return okay;
}

+ 4
- 0
src/dds/util/parallel.cpp View File

@@ -1,5 +1,7 @@
#include "./parallel.hpp"

#include <dds/util/signal.hpp>

#include <dds/util/log.hpp>

using namespace dds;
@@ -7,6 +9,8 @@ using namespace dds;
void dds::log_exception(std::exception_ptr eptr) noexcept {
try {
std::rethrow_exception(eptr);
} catch (const dds::user_cancelled&) {
// Don't log this one. The user knows what they did
} catch (const std::exception& e) {
dds_log(error, "{}", e.what());
}

Loading…
Cancel
Save