Tidying
This commit is contained in:
@ -65,10 +65,21 @@ void list_servers() {
|
||||
service_runner ss;
|
||||
if (ss.init(server.name, service.service_name))
|
||||
{
|
||||
if (ss.is_healthy())
|
||||
serviceticks += ":tick: ";
|
||||
else
|
||||
serviceticks += ":cross: ";
|
||||
switch (ss.is_healthy())
|
||||
{
|
||||
case service_runner::HealthStatus::HEALTHY:
|
||||
serviceticks += ":tick: ";
|
||||
break;
|
||||
case service_runner::HealthStatus::UNHEALTHY:
|
||||
serviceticks += ":cross: ";
|
||||
break;
|
||||
case service_runner::HealthStatus::NOTINSTALLED:
|
||||
serviceticks += ":warning: ";
|
||||
break;
|
||||
case service_runner::HealthStatus::ERROR:
|
||||
serviceticks += ":error: ";
|
||||
break;
|
||||
}
|
||||
}
|
||||
else std::cout<<"Error: Failed to initialise service runner for server: ["<<server.name<<"] and service: ["<<service.service_name<<"]"<<std::endl;
|
||||
std::vector<int> ports = ss.get_ports();
|
||||
@ -140,13 +151,26 @@ void show_server_details(const std::string& server_name) {
|
||||
|
||||
std::vector<ServiceInfo> services = get_server_services_info(server_name);
|
||||
for (const auto& service : services) {
|
||||
bool healthy = false;
|
||||
std::string healthy = "?";
|
||||
std::vector<int> ports;
|
||||
service_runner ss;
|
||||
if (ss.init(server_name, service.service_name))
|
||||
{
|
||||
if (ss.is_healthy())
|
||||
healthy=true;
|
||||
switch (ss.is_healthy())
|
||||
{
|
||||
case service_runner::HealthStatus::HEALTHY:
|
||||
healthy = ":check:";
|
||||
break;
|
||||
case service_runner::HealthStatus::UNHEALTHY:
|
||||
healthy = ":cross:";
|
||||
break;
|
||||
case service_runner::HealthStatus::NOTINSTALLED:
|
||||
healthy = ":warning:";
|
||||
break;
|
||||
default:
|
||||
healthy = ":error:";
|
||||
break;
|
||||
}
|
||||
ports = ss.get_ports();
|
||||
}
|
||||
bool first = true;
|
||||
@ -158,7 +182,7 @@ void show_server_details(const std::string& server_name) {
|
||||
ports_str += std::to_string(port);
|
||||
first = false;
|
||||
}
|
||||
tp.add_row({healthy ? ":tick:" : ":cross:", service.service_name, ports_str});
|
||||
tp.add_row({healthy, service.service_name, ports_str});
|
||||
} // end of for (const auto& service : services)
|
||||
tp.print();
|
||||
} // end of list services
|
||||
|
Reference in New Issue
Block a user