~singpolyma/biboumi

db503b23e86d1cb390d12298875eb0eaffdbfa3c — louiz’ 7 years ago 7cc05ab
Use log_error instead of cerr
2 files changed, 10 insertions(+), 11 deletions(-)

M louloulibs/config/config.cpp
M src/main.cpp
M louloulibs/config/config.cpp => louloulibs/config/config.cpp +6 -5
@@ 1,9 1,10 @@
#include <config/config.hpp>
#include <logger/logger.hpp>

#include <iostream>
#include <cstring>
#include <sstream>

#include <stdlib.h>
#include <cstdlib>

std::string Config::filename{};
std::map<std::string, std::string> Config::values{};


@@ 22,7 23,7 @@ int Config::get_int(const std::string& option, const int& def)
{
  std::string res = Config::get(option, "");
  if (!res.empty())
    return atoi(res.c_str());
    return std::atoi(res.c_str());
  else
    return def;
}


@@ 65,7 66,7 @@ bool Config::read_conf(const std::string& name)
  std::ifstream file(Config::filename.data());
  if (!file.is_open())
    {
      perror(("Error while opening file " + filename + " for reading.").c_str());
      log_error("Error while opening file ", filename, " for reading: ", strerror(errno));
      return false;
    }



@@ 95,7 96,7 @@ void Config::save_to_file()
  std::ofstream file(Config::filename.data());
  if (file.fail())
    {
      std::cerr << "Could not save config file." << std::endl;
      log_error("Could not save config file.");
      return ;
    }
  for (const auto& it: Config::values)

M src/main.cpp => src/main.cpp +4 -6
@@ 28,11 28,9 @@ static bool exiting = false;
int config_help(const std::string& missing_option)
{
  if (!missing_option.empty())
    std::cerr << "Error: empty value for option " << missing_option << "." << std::endl;
  std::cerr <<
    "Please provide a configuration file filled like this:\n\n"
    "hostname=irc.example.com\npassword=S3CR3T"
            << std::endl;
    log_error("Error: empty value for option ", missing_option, ".");
  log_error("Please provide a configuration file filled like this:\n\n"
            "hostname=irc.example.com\npassword=S3CR3T");
  return 1;
}



@@ 52,7 50,7 @@ static void sigusr_handler(int, siginfo_t*, void*)
int main(int ac, char** av)
{
  const std::string conf_filename = ac > 1 ? av[1] : xdg_config_path("biboumi.cfg");
  std::cerr << "Using configuration file: " << conf_filename << std::endl;
  log_info("Using configuration file: ", conf_filename);

  if (!Config::read_conf(conf_filename))
    return config_help("");