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

This commit is contained in:
3lswear
2022-02-19 22:31:32 +03:00
29 changed files with 690 additions and 265 deletions

View File

@@ -9,12 +9,25 @@ int main(int argc, char **argv)
(void)argv;
Server server;
char *path = (char *)"config/real.toml";
try
{
if (argv[1] != NULL)
server.readConfig(argv[1]);
else
server.readConfig(path);
server.start();
}
catch(const ConfigException& e)
{
std::cerr << RED << "\n" << e.getMessage() << '\n' << ENDL;
}
catch (std::domain_error &e)
{
std::cerr << RED << "FATAL: ";
std::cerr << e.what() << RESET << std::endl;
}
server.readConfig(argv[1]);
server.setupConfig();
server.start();
server.end();
return (0);
}