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

Merge remote-tracking branch 'origin/parser' into fara

Browse Source
This commit is contained in:
Talyx
2022-02-14 21:08:19 +03:00
parent b1a1404863 eaaa126e97
commit c21aae0b1d
10 changed files with 230 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Server/Server.cpp
View File

@@ -34,10 +34,32 @@ void Server::print_epoll_events(unsigned int events)
//----------------------------------------------Send--------------------------------------------------------------------------------------------
//----------------------------------------------Configuration-----------------------------------------------------------------------------------
void Server::readConfig(void)
void Server::readConfig(char *filename)
{
TOMLMap *root = parse();
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::iterator it1;
@@ -406,9 +428,9 @@ void Server::clean_parsed(TOMLMap *root)
DBOUT << ">>> cleaning up: <<<" << std::endl;
for (it = root->begin(); it != root->end(); ++it)
{
/* DBOUT << RED << it->first */
/* << ": " << GREEN */
/* << *(it->second->toString()); */
DBOUT << RED << it->first
<< ": " << GREEN
<< *(it->second->toString());
clean_generic(it->second);
/* delete it->second; */

2
src/Server/Server.hpp
View File

@@ -56,7 +56,7 @@ class Server
Server();
Server(std::string path);
void readConfig(void);
void readConfig(char *filename);
void setupConfig(void);
void start(void);
void end(void);