diff options
| author | sghctoma <sghctoma@gmail.com> | 2018-09-07 15:45:20 +0200 |
|---|---|---|
| committer | sghctoma <sghctoma@gmail.com> | 2018-09-07 15:45:20 +0200 |
| commit | bbeed1bd3179a082b5bfb04010e6c476e75e4320 (patch) | |
| tree | 3042498f064af4c4517bf66798caa607ebbd759a /rootston/config.c | |
| parent | d948bffd3e7b283870dcbd7f1a5dd2aaea1950ec (diff) | |
| parent | 085142ba346e0b8dd1a9b1a969a37156cf5656c1 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-freebsd-direct-session
Diffstat (limited to 'rootston/config.c')
| -rw-r--r-- | rootston/config.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/rootston/config.c b/rootston/config.c index 0c0ad055..92d90de1 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -26,7 +26,10 @@ static void usage(const char *name, int ret) { " See `rootston.ini.example` for config\n" " file documentation.\n" " -E <COMMAND> Command that will be ran at startup.\n" - " -D Enable damage tracking debugging.\n", + " -D Enable damage tracking debugging.\n" + " -l <LEVEL> Set log verbosity, where,\n" + " 0:SILENT, 1:ERROR, 2:INFO, 3+:DEBUG\n" + " (default: DEBUG)\n", name); exit(ret); @@ -455,7 +458,8 @@ struct roots_config *roots_config_create_from_args(int argc, char *argv[]) { wl_list_init(&config->bindings); int c; - while ((c = getopt(argc, argv, "C:E:hD")) != -1) { + unsigned int log_verbosity = WLR_DEBUG; + while ((c = getopt(argc, argv, "C:E:hDl:")) != -1) { switch (c) { case 'C': config->config_path = strdup(optarg); @@ -466,11 +470,18 @@ struct roots_config *roots_config_create_from_args(int argc, char *argv[]) { case 'D': config->debug_damage_tracking = true; break; + case 'l': + log_verbosity = strtoul(optarg, NULL, 10); + if (log_verbosity >= WLR_LOG_IMPORTANCE_LAST) { + log_verbosity = WLR_LOG_IMPORTANCE_LAST - 1; + } + break; case 'h': case '?': usage(argv[0], c != 'h'); } } + wlr_log_init(log_verbosity, NULL); if (!config->config_path) { // get the config path from the current directory |