tanner/logiops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reorganise logid.cpp

Browse Source
This commit is contained in:
PixlOne 2020-04-12 19:44:12 -04:00 committed by pixl
parent 6e7445b197
commit 6316b89840
No known key found for this signature in database
GPG Key ID: 1866C148CD593B6E
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/logid/logid.cpp
View File

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