roman/webserv
1
0
Fork 0
mirror of https://github.com/3lswear/webserv.git synced 2025-10-28 21:07:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat: catch exceptions in readConfig

Browse Source
This commit is contained in:
3lswear
2022-02-13 22:45:56 +03:00
parent a230ca2639
commit eaaa126e97
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Server/Server.cpp
View File

@@ -36,8 +36,30 @@ void Server::print_epoll_events(unsigned int events)
//----------------------------------------------Configuration----------------------------------------------------------------------------------- //----------------------------------------------Configuration-----------------------------------------------------------------------------------
void Server::readConfig(char *filename) void Server::readConfig(char *filename)
{ {
TOMLMap *root = parse(filename); TOMLMap *root = NULL;
try
{
root = parse(filename);
}
catch (config::Tokenizer::NoMoreTokens &e)
{
std::cerr << RED << "FATAL: ";
std::cerr << e.what() << RESET << std::endl;
// root->clear();
// delete root;
// clean_parsed(root);
return;
}
catch (config::Tokenizer::InvalidToken &e)
{
std::cerr << RED << "FATAL: ";
std::cerr << e.what() << RESET << std::endl;
// clean_parsed(root);
// root->clear();
delete root;
return;
}
/* TOMLMap *map; */ /* TOMLMap *map; */
TOMLMap::iterator it1; TOMLMap::iterator it1;
@@ -408,9 +430,9 @@ void Server::clean_parsed(TOMLMap *root)
DBOUT << ">>> cleaning up: <<<" << std::endl; DBOUT << ">>> cleaning up: <<<" << std::endl;
for (it = root->begin(); it != root->end(); ++it) for (it = root->begin(); it != root->end(); ++it)
{ {
/* DBOUT << RED << it->first */ DBOUT << RED << it->first
/* << ": " << GREEN */ << ": " << GREEN
/* << *(it->second->toString()); */ << *(it->second->toString());
clean_generic(it->second); clean_generic(it->second);
/* delete it->second; */ /* delete it->second; */