logging: Add quiet option

Mostly for debug?
Sometimes logging changes timing.
This commit is contained in:
Kim Woelders
2023-02-10 09:26:34 +01:00
parent 6e5c44eb29
commit 895cfffc6b
3 changed files with 15 additions and 5 deletions
+8 -1
View File
@@ -15,6 +15,8 @@
char log_level = 0; char log_level = 0;
static char log_threshold = LOG_DEBUG;
static FILE *log_dest = NULL; static FILE *log_dest = NULL;
void nvt_log_dest(int dest) void nvt_log_dest(int dest)
@@ -34,8 +36,10 @@ void nvt_log_dest(int dest)
} }
} }
void nvt_log_level(int level) void nvt_log_level(int quiet, int level)
{ {
if (quiet)
log_threshold = LOG_NOTICE;
log_level = level; log_level = level;
} }
@@ -63,6 +67,9 @@ void nvt_log(int prio, const char *fmt, ...)
const char *eol; const char *eol;
int len; int len;
if (prio > log_threshold)
return;
va_start(arg, fmt); va_start(arg, fmt);
len = vsnprintf(buf, sizeof(buf), fmt, arg); len = vsnprintf(buf, sizeof(buf), fmt, arg);
+1 -1
View File
@@ -10,7 +10,7 @@
#define _PRF2_ _PRF_N_(2) #define _PRF2_ _PRF_N_(2)
void nvt_log_dest(int dest); void nvt_log_dest(int dest);
void nvt_log_level(int level); void nvt_log_level(int quiet, int level);
_PRF2_ void nvt_log(int prio, const char *fmt, ...); _PRF2_ void nvt_log(int prio, const char *fmt, ...);
void nvt_log_buf(int prio, const char *txt, void nvt_log_buf(int prio, const char *txt,
const void *ptr, unsigned int len); const void *ptr, unsigned int len);
+6 -3
View File
@@ -42,7 +42,8 @@ static struct ttynvt_param {
unsigned int major; unsigned int major;
unsigned int minor; unsigned int minor;
const char *dev_name; const char *dev_name;
char *server; const char *server;
unsigned int quiet;
unsigned int debug; unsigned int debug;
int logstd; int logstd;
/* Derived */ /* Derived */
@@ -525,7 +526,7 @@ static void ttynvt_open(fuse_req_t req, struct fuse_file_info *info)
return; return;
open_err: open_err:
nvt_log(LOG_INFO, "Connection to server: %s:%d failed: %m\n", nvt_log(LOG_ERR, "Connection to server: %s:%d failed: %m\n",
ttynvt_param.host, ttynvt_param.port); ttynvt_param.host, ttynvt_param.port);
for (n = 0; n < 3; n++) for (n = 0; n < 3; n++)
@@ -1139,6 +1140,7 @@ static const struct fuse_opt ttynvt_opts[] = {
TTYNET_OPT("--min=%u", minor, 1), TTYNET_OPT("--min=%u", minor, 1),
TTYNET_OPT("-n %s", dev_name, 0), TTYNET_OPT("-n %s", dev_name, 0),
TTYNET_OPT("--name=%s", dev_name, 0), TTYNET_OPT("--name=%s", dev_name, 0),
TTYNET_OPT("-q", quiet, 1),
TTYNET_OPT("-S %s", server, 0), TTYNET_OPT("-S %s", server, 0),
TTYNET_OPT("--server=%s", server, 0), TTYNET_OPT("--server=%s", server, 0),
FUSE_OPT_KEY("-h", 0), FUSE_OPT_KEY("-h", 0),
@@ -1157,6 +1159,7 @@ static void print_help(void)
"\t-m minor, --min=minor\n" "\t-m minor, --min=minor\n"
"\t-n name, --name=name (default: ttyNVT0)\n" "\t-n name, --name=name (default: ttyNVT0)\n"
"\t\tDevice will be created in /dev/$name.\n" "\t\tDevice will be created in /dev/$name.\n"
"\t-q\t\tBe quiet (suppress informational messages)\n"
"\t-S server, --server=host:port\n"); "\t-S server, --server=host:port\n");
} }
@@ -1192,7 +1195,7 @@ int main(int argc, char *argv[])
return 1; return 1;
} }
nvt_log_level(ttynvt_param.debug); nvt_log_level(ttynvt_param.quiet, ttynvt_param.debug);
if (ttynvt_param.logstd) if (ttynvt_param.logstd)
nvt_log_dest(NVT_LOG_STDOUT); nvt_log_dest(NVT_LOG_STDOUT);