mirror of https://notabug.org/acetone/ircabot.git
проверка переданных параметров и выдача ошибки, если конфига нет
parent
efd46a81b4
commit
a1127b3139
14
main.cpp
14
main.cpp
|
@ -188,7 +188,7 @@ std::string search(std::string text)
|
||||||
bool read_config()
|
bool read_config()
|
||||||
{
|
{
|
||||||
if (!boost::filesystem::exists(config_file)) {
|
if (!boost::filesystem::exists(config_file)) {
|
||||||
std::cerr << "Config not found" << std::endl;
|
log ("Config not found");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -237,7 +237,7 @@ int write_log(std::string msg)
|
||||||
|
|
||||||
void usage(std::string path)
|
void usage(std::string path)
|
||||||
{
|
{
|
||||||
std::cout << path << " path/to/config.json" << std::endl;
|
std::cout << "Usage: " << path << " <path/to/config.json>" << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
void make_tsc()
|
void make_tsc()
|
||||||
|
@ -367,12 +367,16 @@ void handler()
|
||||||
|
|
||||||
int main(int argc, char * argv[])
|
int main(int argc, char * argv[])
|
||||||
{
|
{
|
||||||
if (argc >= 2) config_file = static_cast<std::string>(argv[1]);
|
if (argc > 1) config_file = static_cast<std::string>(argv[1]);
|
||||||
if (!read_config()) return 1;
|
else {
|
||||||
|
usage(static_cast<std::string>(argv[0]));
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (!read_config()) return 2;
|
||||||
|
|
||||||
std::thread connection(make_tsc);
|
std::thread connection(make_tsc);
|
||||||
handler();
|
handler();
|
||||||
connection.join();
|
connection.join();
|
||||||
|
|
||||||
return 2;
|
return 3;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue