fabian/actsim-cluster-agent
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed throwing exception references instead of references

Browse source
This commit is contained in:
Fabian Posch 2024-01-08 14:11:09 -05:00
parent 2df267e7b3
commit 57b2c76323
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cli_util.cpp
View file

@ -33,7 +33,7 @@ void get_db_cred_env (db::db_credentials_t& db_cred) {
// check if a server was given
if (!db_cred.server_override) {
if (std::getenv(SERVER_ADDR_ENV) == nullptr) {
throw new std::invalid_argument("No database server set in environment variable " SERVER_ADDR_ENV);
throw std::invalid_argument("No database server set in environment variable " SERVER_ADDR_ENV);
}
db_cred.server = std::getenv(SERVER_ADDR_ENV);
@ -58,12 +58,12 @@ void get_db_cred_env (db::db_credentials_t& db_cred) {
try {
db_cred.port = std::atoi(port_st.c_str());
} catch (std::invalid_argument& e) {
throw new std::invalid_argument("Could not parse port from environment variable " SERVER_PORT_ENV);
throw std::invalid_argument("Could not parse port from environment variable " SERVER_PORT_ENV);
}
// make sure the port is valid
if (db_cred.port <= 0) {
throw new std::invalid_argument("Port " SERVER_PORT_ENV " given in environment variable is not a valid port.");
throw std::invalid_argument("Port " SERVER_PORT_ENV " given in environment variable is not a valid port.");
}
db_cred.port_override = false;
@ -73,7 +73,7 @@ void get_db_cred_env (db::db_credentials_t& db_cred) {
// check if a user was given
if (!db_cred.uname_override) {
if (std::getenv(SERVER_USER_ENV) == nullptr) {
throw new std::invalid_argument("No database user set in environment variable " SERVER_USER_ENV);
throw std::invalid_argument("No database user set in environment variable " SERVER_USER_ENV);
}
db_cred.uname = std::getenv(SERVER_USER_ENV);
db_cred.uname_override = false;
@ -82,7 +82,7 @@ void get_db_cred_env (db::db_credentials_t& db_cred) {
// check if a password was given
if (!db_cred.pwd_override) {
if (std::getenv(SERVER_PWD_ENV) == nullptr) {
throw new std::invalid_argument("No database password set in environment variable " SERVER_PWD_ENV);
throw std::invalid_argument("No database password set in environment variable " SERVER_PWD_ENV);
}
db_cred.pwd = std::getenv(SERVER_PWD_ENV);
db_cred.pwd_override = false;
@ -91,7 +91,7 @@ void get_db_cred_env (db::db_credentials_t& db_cred) {
// check if a database was given
if (!db_cred.dbase_override) {
if (std::getenv(SERVER_DBASE_ENV) == nullptr) {
throw new std::invalid_argument("No database set in environment variable " SERVER_DBASE_ENV);
throw std::invalid_argument("No database set in environment variable " SERVER_DBASE_ENV);
}
db_cred.dbase = std::getenv(SERVER_DBASE_ENV);
db_cred.dbase_override = false;