Update scripts.
This commit is contained in:
@ -78,6 +78,9 @@ void list_servers() {
|
||||
tableprint tp("All DropShell Servers");
|
||||
tp.add_row({"Name", "User", "Address", "Health", "Ports"});
|
||||
|
||||
std::cout << "Checking "<<servers.size() << " servers: " << std::flush;
|
||||
int checked = 0;
|
||||
|
||||
transwarp::parallel exec{servers.size()};
|
||||
auto task = transwarp::for_each(exec, servers.begin(), servers.end(), [&](const ServerInfo& server) {
|
||||
std::map<std::string, ServiceStatus> status = service_runner::get_all_services_status(server.name);
|
||||
@ -93,8 +96,12 @@ void list_servers() {
|
||||
ports_used_str += std::to_string(port) + " ";
|
||||
|
||||
tp.add_row({server.name, server.ssh_user, server.ssh_host, serviceticks, ports_used_str});
|
||||
++checked;
|
||||
// print out a tick character for each server checked.
|
||||
std::cout << checked << " ✓ " << std::flush;
|
||||
});
|
||||
task->wait();
|
||||
std::cout << std::endl << std::endl;
|
||||
tp.print();
|
||||
}
|
||||
|
||||
|
@ -79,7 +79,7 @@ bool service_runner::install() {
|
||||
}
|
||||
}
|
||||
|
||||
// Copy service files (including service.env)
|
||||
// Copy service files
|
||||
{
|
||||
std::string local_service_path = localpath::service(mServer,mService);
|
||||
if (local_service_path.empty() || !fs::exists(local_service_path)) {
|
||||
|
@ -66,7 +66,7 @@ LocalServiceInfo get_service_info(const std::string &server_name, const std::str
|
||||
std::map<std::string, std::string> variables;
|
||||
get_all_service_env_vars(server_name, service_name, variables);
|
||||
|
||||
// load the service.env file
|
||||
// confirm TEMPLATE is defined.
|
||||
auto it = variables.find("TEMPLATE");
|
||||
if (it == variables.end()) {
|
||||
std::cerr << "Error: TEMPLATE variable not defined in service " << service_name << " on server " << server_name << std::endl;
|
||||
@ -199,7 +199,7 @@ bool create_service(const std::string &server_name, const std::string &template_
|
||||
std::cout << "Service " << service_name <<" created successfully"<<std::endl;
|
||||
std::cout << std::endl;
|
||||
std::cout << "To complete the installation, please:" << std::endl;
|
||||
std::cout << "1. edit the service.env file: dropshell edit " << server_name << " " << service_name << std::endl;
|
||||
std::cout << "1. edit the service config file: dropshell edit " << server_name << " " << service_name << std::endl;
|
||||
std::cout << "2. install the remote service: dropshell install " << server_name << " " << service_name << std::endl;
|
||||
}
|
||||
return true;
|
||||
|
Reference in New Issue
Block a user