Styles

src/vamp_zero/app.cpp

@@ -41,7 +41,7 @@ auto invalid(std::string message) -> modulus::error {
 }
 
 auto usage() -> std::string {
-  return "usage: vamp-zero [--config PATH] [--check-config] [--health-check] [--version] [--once] [--migrate]";
+  return "usage: vamp-zero [--config PATH] [--check-config] [--health-check] [--version] [--once] [--ensure-database]";
 }
 
 auto bind_port(vamp_zero::config const& config) -> std::uint16_t {
@@ -88,9 +88,9 @@ auto write_heartbeat(vamp_zero::config const& config) -> std::expected<void, mod
   return write_text_atomic(config.runtime.heartbeat_path, boost::json::serialize(heartbeat));
 }
 
-auto migrate(vamp_zero::config const& config) -> std::expected<void, modulus::error> {
+auto ensure_database(vamp_zero::config const& config) -> std::expected<void, modulus::error> {
   auto io = boost::asio::io_context{};
-  auto future = boost::asio::co_spawn(io, vamp_zero::async_migrate_database(io.get_executor(), config.database), boost::asio::use_future);
+  auto future = boost::asio::co_spawn(io, vamp_zero::async_ensure_database(io.get_executor(), config.database), boost::asio::use_future);
   io.run();
   return future.get();
 }
@@ -258,8 +258,8 @@ auto vamp_zero::parse_command_line(std::int32_t argc, std::char_t** argv) -> std
       result.print_version = true;
     } else if (argument == "--once") {
       result.exit_after_startup = true;
-    } else if (argument == "--migrate") {
-      result.migrate = true;
+    } else if (argument == "--ensure-database") {
+      result.ensure_database = true;
     } else if (argument == "--help" || argument == "-h") {
       return std::unexpected(invalid(usage()));
     } else {
@@ -270,7 +270,7 @@ auto vamp_zero::parse_command_line(std::int32_t argc, std::char_t** argv) -> std
     + static_cast<std::uint32_t>(result.health_check ? 1 : 0)
     + static_cast<std::uint32_t>(result.print_version ? 1 : 0)
     + static_cast<std::uint32_t>(result.exit_after_startup ? 1 : 0)
-    + static_cast<std::uint32_t>(result.migrate ? 1 : 0);
+    + static_cast<std::uint32_t>(result.ensure_database ? 1 : 0);
   if (command_count > 1U) {
     return std::unexpected(invalid("only one command flag may be selected"));
   }
@@ -295,17 +295,17 @@ auto vamp_zero::run(vamp_zero::command_line command) -> std::expected<void, modu
     std::cout << "ok\n";
     return {};
   }
-  if (command.migrate) {
-    return migrate(*config);
+  if (command.ensure_database) {
+    return ensure_database(*config);
   }
   if (command.exit_after_startup || config->runtime.exit_after_startup) {
     std::cout << "ok\n";
     return {};
   }
 
-  auto migrated = migrate(*config);
-  if (!migrated) {
-    return migrated;
+  auto ensured = ensure_database(*config);
+  if (!ensured) {
+    return ensured;
   }
   auto imported = import_library(*config);
   if (!imported) {