Merge pull request #938 from gofractally/improve-boot-related-CLI-output

Improve boot related cli output
gofractally · Dec 4, 2024 · 60d3617 · 60d3617
2 parents ea931a5 + 10a7693
commit 60d3617
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 13 deletions.
diff --git a/libraries/psibase/native/include/psibase/ForkDb.hpp b/libraries/psibase/native/include/psibase/ForkDb.hpp
@@ -1449,7 +1449,7 @@ namespace psibase
          try
          {
             if (bc->needGenesisAction)
-               trace.error = "Need genesis block; use 'psibase boot' to boot chain";
+               trace.error = "Node is not connected to any psibase network.";
             else
             {
                check(trx.proofs.size() == trx.transaction->claims().size(),

diff --git a/libraries/psibase_http/handle_request.cpp b/libraries/psibase_http/handle_request.cpp
@@ -696,7 +696,7 @@ namespace psibase::http
             bc.start();
             if (bc.needGenesisAction)
                return send(error(bhttp::status::internal_server_error,
-                                 "Need genesis block; use 'psibase boot' to boot chain"));
+                                 "Node is not connected to any psibase network."));
 
             SignedTransaction  trx;
             TransactionTrace   trace;

diff --git a/programs/psinode/main.cpp b/programs/psinode/main.cpp
@@ -688,7 +688,7 @@ bool pushTransaction(psibase::SharedState&                  sharedState,
       try
       {
          if (bc.needGenesisAction)
-            trace.error = "Need genesis block; use 'psibase boot' to boot chain";
+            trace.error = "Node is not connected to any psibase network.";
          else
          {
             check(trx.proofs.size() == trx.transaction->claims().size(),
@@ -2097,9 +2097,9 @@ void run(const std::string&              db_path,
                    }
                    else
                    {
-                      check(
-                          false,
-                          "should not get here, because service should have been checked already");
+                      check(false,
+                            "should not get here, because service should have been checked "
+                            "already");
                    }
                    std::vector<Claim> claim;
                    result->get(claim);
@@ -2374,8 +2374,47 @@ void run(const std::string&              db_path,
          {
             if (!showedBootMsg)
             {
-               PSIBASE_LOG(node.chain().getLogger(), notice)
-                   << "Need genesis block; use 'psibase boot' to boot chain";
+               std::string xAdminSubdomain;
+               for (const auto& service : services)
+               {
+                  if (service.root.string().find("services/x-admin") != std::string::npos &&
+                      service.host.ends_with('.'))
+                  {
+                     xAdminSubdomain = service.host + host;
+                     break;
+                  }
+               }
+
+               if (!xAdminSubdomain.empty())
+               {
+                  std::string protocol;
+                  std::string port;
+                  for (const auto& listen : http_config->listen)
+                  {
+                     if (const auto* spec =
+                             std::get_if<psibase::http::tcp_listen_spec<true>>(&listen))
+                     {
+                        protocol = "https://";
+                        port     = std::to_string(spec->endpoint.port());
+                        break;
+                     }
+                     else if (const auto* spec =
+                                  std::get_if<psibase::http::tcp_listen_spec<false>>(&listen))
+                     {
+                        protocol = "http://";
+                        port     = std::to_string(spec->endpoint.port());
+                     }
+                  }
+                  xAdminSubdomain = protocol + xAdminSubdomain + ":" + port;
+               }
+
+               std::string message = "Node is not connected to any psibase network.";
+               if (!xAdminSubdomain.empty())
+               {
+                  message += " Visit '" + xAdminSubdomain + "' for node setup.";
+               }
+
+               PSIBASE_LOG(node.chain().getLogger(), notice) << message;
                showedBootMsg = true;
             }
             //continue;
@@ -2448,8 +2487,8 @@ int main(int argc, char* argv[])
        "Controls client access to the admin API");
    opt("database-cache-size",
        po::value(&db_cache_size)->default_value({std::size_t(1) << 33}, "8 GiB"),
-       "The amount of RAM reserved for the database cache. Must be at least 64 MiB. Warning: this "
-       "will not modify an existing database. This option is subject to change.");
+       "The amount of RAM reserved for the database cache. Must be at least 64 MiB. Warning: "
+       "this will not modify an existing database. This option is subject to change.");
 #ifdef PSIBASE_ENABLE_SSL
    opt("tls-trustfile", po::value(&root_ca)->default_value({}, "")->value_name("path"),
        "A list of trusted Certification Authorities in PEM format");

diff --git a/programs/psitest/main.cpp b/programs/psitest/main.cpp
@@ -1358,7 +1358,7 @@ struct callbacks
 
       psibase::BlockContext bc{*chain.sys, chain.head, chain.writer, true};
       bc.start();
-      psibase::check(!bc.needGenesisAction, "Need genesis block; use 'psibase boot' to boot chain");
+      psibase::check(!bc.needGenesisAction, "Node is not connected to any psibase network.");
       psibase::SignedTransaction  trx;
       psibase::TransactionContext tc{bc, trx, trace, true, false, true};
 

diff --git a/rust/psibase/src/main.rs b/rust/psibase/src/main.rs
@@ -823,8 +823,9 @@ async fn boot(args: &BootArgs) -> Result<(), anyhow::Error> {
         .await?;
         progress.inc(1)
     }
+
     if !args.tx_args.suppress_ok {
-        println!("Ok");
+        println!("Successfully booted {}", args.node_args.api);
     }
     Ok(())
 }
@@ -1257,7 +1258,7 @@ fn handle_unbooted(list: Result<PackageList, anyhow::Error>) -> Result<PackageLi
     if let Err(e) = &list {
         if e.root_cause()
             .to_string()
-            .contains("Need genesis block; use 'psibase boot' to boot chain")
+            .contains("Node is not connected to any psibase network.")
         {
             return Ok(PackageList::new());
         }