public/dropshell
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debugging
Some checks failed
Dropshell Test / Build_and_Test (push) Failing after 2m10s
Details

Browse Source
This commit is contained in:
Your Name
2025-05-25 19:17:51 +12:00
parent 1502d6e3d2
commit 8f06fc31ae
17 changed files with 220 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/src/servers.cpp
View File

@@ -104,7 +104,7 @@ namespace dropshell
catch (const std::exception &e)
{
error << "Failed to parse " << server_json_path << std::endl;
error << "Error: " << e.what() << std::endl;
error << "Exception: " << e.what() << std::endl;
mValid = false;
}
@@ -241,7 +241,7 @@ namespace dropshell
bool okay = execute_ssh_command(sshinfo, scommand, cMode::Silent);
if (!okay)
{
std::cerr << "Error: Required items not found on remote server: " << file_names_str << std::endl;
error << "Required items not found on remote server: " << file_names_str << std::endl;
return false;
}
return true;
@@ -341,7 +341,7 @@ namespace dropshell
std::map<std::string, std::string> env_vars;
if (!get_all_service_env_vars(mServerName, service_name, env_vars))
{
std::cerr << "Error: Failed to get all service env vars for " << service_name << std::endl;
error << "Failed to get all service env vars for " << service_name << std::endl;
return std::nullopt;
}
@@ -358,7 +358,7 @@ namespace dropshell
if (sc.empty())
{
std::cerr << "Error: Failed to construct command for " << service_name << " " << command << std::endl;
error << "Failed to construct command for " << service_name << " " << command << std::endl;
return std::nullopt;
}
return sc;
@@ -388,7 +388,7 @@ namespace dropshell
ServerConfig env(server_name);
if (!env.is_valid())
{
std::cerr << "Error: Invalid server environment file: " << entry.path().string() << std::endl;
error << "Invalid server environment file: " << entry.path().string() << std::endl;
continue;
}
servers.push_back(env);
@@ -406,7 +406,7 @@ namespace dropshell
std::string server_existing_dir = localpath::server(server_name);
if (!server_existing_dir.empty())
{
error << "Error: Server name already exists: " << server_name << std::endl;
error << "Server name already exists: " << server_name << std::endl;
info << "Current server path: " << server_existing_dir << std::endl;
return false;
}
@@ -415,7 +415,7 @@ namespace dropshell
auto lsdp = gConfig().get_local_server_definition_paths();
if (lsdp.empty() || lsdp[0].empty())
{
error << "Error: Local server definition path not found" << std::endl;
error << "Local server definition path not found" << std::endl;
info << "Run 'dropshell edit' to configure DropShell" << std::endl;
return false;
}
@@ -434,7 +434,9 @@ namespace dropshell
server_env_file << " \"USER\": \"" << user << "\"," << std::endl;
server_env_file << " \"DIR\": \"" << "/home/" + user << "/.dropshell\"" << std::endl;
server_env_file << " }" << std::endl;
server_env_file << " ]" << std::endl;
server_env_file << " ]," << std::endl;
server_env_file << " \"HAS_DOCKER\": \"true\"," << std::endl;
server_env_file << " \"DOCKER_ROOTLESS\": \"false\"" << std::endl;
server_env_file << "}" << std::endl;
server_env_file.close();