diff options
| author | Daniel Eklöf <daniel@ekloef.se> | 2021-02-11 18:00:09 +0000 |
|---|---|---|
| committer | Daniel Eklöf <daniel@ekloef.se> | 2021-02-11 18:00:09 +0000 |
| commit | da7da4cba51a6444d1fce8fc8767f25cbe38b351 (patch) | |
| tree | 753c75d7f159fb82719cad42efd3144070a7f1d7 /main.c | |
| parent | Merge branch 'fdm-signal-handling' (diff) | |
| parent | main: client: factor out some common code for "--log-level" option (diff) | |
Merge branch 'log-level'
Closes #337
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 58 |
1 files changed, 38 insertions, 20 deletions
@@ -23,6 +23,7 @@ #include "config.h" #include "foot-features.h" #include "fdm.h" +#include "macros.h" #include "reaper.h" #include "render.h" #include "server.h" @@ -57,24 +58,25 @@ print_usage(const char *prog_name) "Usage: %s [OPTIONS...] command [ARGS...]\n" "\n" "Options:\n" - " -c,--config=PATH load configuration from PATH ($XDG_CONFIG_HOME/foot/foot.ini)\n" - " --check-config verify configuration, exit with 0 if ok, otherwise exit with 1\n" - " -f,--font=FONT comma separated list of fonts in fontconfig format (monospace)\n" - " -t,--term=TERM value to set the environment variable TERM to (foot)\n" - " --title=TITLE initial window title (foot)\n" - " -a,--app-id=ID window application ID (foot)\n" - " --maximized start in maximized mode\n" - " --fullscreen start in fullscreen mode\n" - " --login-shell start shell as a login shell\n" - " -w,--window-size-pixels=WIDTHxHEIGHT initial width and height, in pixels\n" - " -W,--window-size-chars=WIDTHxHEIGHT initial width and height, in characters\n" - " -s,--server[=PATH] run as a server (use 'footclient' to start terminals).\n" - " Without PATH, $XDG_RUNTIME_DIR/foot-$WAYLAND_DISPLAY.sock will be used.\n" - " --hold remain open after child process exits\n" - " -p,--print-pid=FILE|FD print PID to file or FD (only applicable in server mode)\n" - " -l,--log-colorize=[never|always|auto] enable/disable colorization of log output on stderr\n" - " -s,--log-no-syslog disable syslog logging (only applicable in server mode)\n" - " -v,--version show the version number and quit\n", + " -c,--config=PATH load configuration from PATH ($XDG_CONFIG_HOME/foot/foot.ini)\n" + " --check-config verify configuration, exit with 0 if ok, otherwise exit with 1\n" + " -f,--font=FONT comma separated list of fonts in fontconfig format (monospace)\n" + " -t,--term=TERM value to set the environment variable TERM to (foot)\n" + " --title=TITLE initial window title (foot)\n" + " -a,--app-id=ID window application ID (foot)\n" + " --maximized start in maximized mode\n" + " --fullscreen start in fullscreen mode\n" + " --login-shell start shell as a login shell\n" + " -w,--window-size-pixels=WIDTHxHEIGHT initial width and height, in pixels\n" + " -W,--window-size-chars=WIDTHxHEIGHT initial width and height, in characters\n" + " -s,--server[=PATH] run as a server (use 'footclient' to start terminals).\n" + " Without PATH, $XDG_RUNTIME_DIR/foot-$WAYLAND_DISPLAY.sock will be used.\n" + " --hold remain open after child process exits\n" + " -p,--print-pid=FILE|FD print PID to file or FD (only applicable in server mode)\n" + " -d,--log-level={info|warning|error} log level (info)\n" + " -l,--log-colorize=[{never|always|auto}] enable/disable colorization of log output on stderr\n" + " -s,--log-no-syslog disable syslog logging (only applicable in server mode)\n" + " -v,--version show the version number and quit\n", prog_name, prog_name); } @@ -170,6 +172,7 @@ main(int argc, char *const *argv) {"fullscreen", no_argument, NULL, 'F'}, {"presentation-timings", no_argument, NULL, 'P'}, /* Undocumented */ {"print-pid", required_argument, NULL, 'p'}, + {"log-level", required_argument, NULL, 'd'}, {"log-colorize", optional_argument, NULL, 'l'}, {"log-no-syslog", no_argument, NULL, 'S'}, {"version", no_argument, NULL, 'v'}, @@ -195,12 +198,13 @@ main(int argc, char *const *argv) bool fullscreen = false; bool unlink_pid_file = false; const char *pid_file = NULL; + enum log_class log_level = LOG_CLASS_INFO; enum log_colorize log_colorize = LOG_COLORIZE_AUTO; bool log_syslog = true; user_notifications_t user_notifications = tll_init(); while (true) { - int c = getopt_long(argc, argv, "+c:Ct:T:a:Lf:w:W:s::HmFPp:l::Svh", longopts, NULL); + int c = getopt_long(argc, argv, "+c:Ct:T:a:Lf:w:W:s::HmFPp:d:l::Svh", longopts, NULL); if (c == -1) break; @@ -305,6 +309,20 @@ main(int argc, char *const *argv) pid_file = optarg; break; + case 'd': { + int lvl = log_level_from_string(optarg); + if (unlikely(lvl < 0)) { + fprintf( + stderr, + "-d,--log-level: %s: argument must be one of %s\n", + optarg, + log_level_string_hint()); + return EXIT_FAILURE; + } + log_level = lvl; + break; + } + case 'l': if (optarg == NULL || strcmp(optarg, "auto") == 0) log_colorize = LOG_COLORIZE_AUTO; @@ -336,7 +354,7 @@ main(int argc, char *const *argv) } log_init(log_colorize, as_server && log_syslog, - as_server ? LOG_FACILITY_DAEMON : LOG_FACILITY_USER, LOG_CLASS_WARNING); + as_server ? LOG_FACILITY_DAEMON : LOG_FACILITY_USER, log_level); argc -= optind; argv += optind; |
