Reorganise logid.cpp
This commit is contained in:
parent
6e7445b197
commit
6316b89840
|
@ -26,6 +26,8 @@
|
||||||
|
|
||||||
using namespace logid;
|
using namespace logid;
|
||||||
|
|
||||||
|
std::string config_file = DEFAULT_CONFIG_FILE;
|
||||||
|
|
||||||
LogLevel logid::global_verbosity = INFO;
|
LogLevel logid::global_verbosity = INFO;
|
||||||
Configuration* logid::global_config;
|
Configuration* logid::global_config;
|
||||||
EvdevDevice* logid::global_evdev;
|
EvdevDevice* logid::global_evdev;
|
||||||
|
@ -40,10 +42,8 @@ enum class Option
|
||||||
Version
|
Version
|
||||||
};
|
};
|
||||||
|
|
||||||
int main(int argc, char** argv)
|
void read_cli_options(int argc, char** argv)
|
||||||
{
|
{
|
||||||
std::string config_file = DEFAULT_CONFIG_FILE;
|
|
||||||
// Read command line options
|
|
||||||
for(int i = 1; i < argc; i++)
|
for(int i = 1; i < argc; i++)
|
||||||
{
|
{
|
||||||
Option option = Option::None;
|
Option option = Option::None;
|
||||||
|
@ -97,7 +97,7 @@ int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
log_printf(WARN, e.what());
|
log_printf(WARN, e.what());
|
||||||
printf("Valid verbosity levels are: Debug, Info, Warn/Warning, or Error.\n");
|
printf("Valid verbosity levels are: Debug, Info, Warn/Warning, or Error.\n");
|
||||||
return EXIT_FAILURE;
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -107,7 +107,7 @@ int main(int argc, char** argv)
|
||||||
if (++i >= argc)
|
if (++i >= argc)
|
||||||
{
|
{
|
||||||
log_printf(ERROR, "Config file is not specified.");
|
log_printf(ERROR, "Config file is not specified.");
|
||||||
return EXIT_FAILURE;
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
config_file = argv[i];
|
config_file = argv[i];
|
||||||
break;
|
break;
|
||||||
|
@ -123,18 +123,23 @@ Possible options are:
|
||||||
-h,--help Print this message.
|
-h,--help Print this message.
|
||||||
)", LOGIOPS_VERSION, argv[0], DEFAULT_CONFIG_FILE);
|
)", LOGIOPS_VERSION, argv[0], DEFAULT_CONFIG_FILE);
|
||||||
|
|
||||||
return EXIT_SUCCESS;
|
exit(EXIT_SUCCESS);
|
||||||
}
|
}
|
||||||
case Option::Version:
|
case Option::Version:
|
||||||
{
|
{
|
||||||
printf("%s\n", LOGIOPS_VERSION);
|
printf("%s\n", LOGIOPS_VERSION);
|
||||||
return EXIT_SUCCESS;
|
exit(EXIT_SUCCESS);
|
||||||
}
|
}
|
||||||
case Option::None:
|
case Option::None:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int main(int argc, char** argv)
|
||||||
|
{
|
||||||
|
read_cli_options(argc, argv);
|
||||||
|
|
||||||
// Read config
|
// Read config
|
||||||
try { global_config = new Configuration(config_file.c_str()); }
|
try { global_config = new Configuration(config_file.c_str()); }
|
||||||
|
|
Loading…
Reference in New Issue
Block a user