diff --git a/include/logger.h b/include/logger.h index 67240b6..8079b38 100644 --- a/include/logger.h +++ b/include/logger.h @@ -21,7 +21,7 @@ #define _LOGGER_H_ #include #include "types.h" -#define LOG_DATA log_param g_log = {NULL, 0, 1, 0, "", 0}; +#define LOG_DATA log_param g_log = {NULL, 0, 1, 0, 0, "", 0}; /** Data structure for logging. */ @@ -30,6 +30,7 @@ typedef struct { int level; /**< maximum logging level. */ int enable; /**< enable/disable logging. */ int quiet; /**< skip logging to stdout. */ + int conlevel; /**< Console loglevel. */ char prog[32]; /**< program name. */ envid_t veid; } log_param; @@ -59,7 +60,7 @@ int set_log_file(char *file); * @param progname program name. */ int init_log(char *file, envid_t veid, int enable, int level, int quiet, - char *progname); + int conlevel, char *progname); /** Close logging. */ diff --git a/src/lib/logger.c b/src/lib/logger.c index 6cb6c02..967f40a 100644 --- a/src/lib/logger.c +++ b/src/lib/logger.c @@ -53,7 +53,7 @@ void logger(int log_level, int err_no, c else out = stdout; va_start(ap, format); - if (!g_log.quiet && g_log.level >= log_level) { + if (!g_log.quiet && g_log.conlevel >= log_level) { va_list ap_save; va_copy(ap_save, ap); @@ -109,7 +109,7 @@ void set_log_level(int level) } int init_log(char *file, envid_t veid, int enable, int level, int quiet, - char *progname) + int conlevel, char *progname) { int ret = 0; @@ -118,6 +118,7 @@ int init_log(char *file, envid_t veid, i return ret; g_log.enable = enable; set_log_level(level); + g_log.conlevel = conlevel; g_log.veid = veid; g_log.quiet = quiet; if (progname != NULL) diff --git a/src/vzcfgvalidate.c b/src/vzcfgvalidate.c index d51d5f4..8ad6be8 100644 --- a/src/vzcfgvalidate.c +++ b/src/vzcfgvalidate.c @@ -66,7 +66,7 @@ int main(int argc, char **argv) free(infile); exit(1); } - init_log(NULL, 0, 1, 0, 0, NULL); + init_log(NULL, 0, 1, 0, 0, 0, NULL); param = init_vps_param(); if (vps_parse_config(0, infile, param, NULL)) exit(1); diff --git a/src/vzctl.c b/src/vzctl.c index 99435d1..caff442 100644 --- a/src/vzctl.c +++ b/src/vzctl.c @@ -142,7 +142,7 @@ int main(int argc, char *argv[], char *e exit(VZ_INVALID_PARAMETER_SYNTAX); } action_nm = argv[1]; - init_log(NULL, 0, 1, verbose, 0, NULL); + init_log(NULL, 0, 1, 2, 0, verbose, NULL); if (!strcmp(argv[1], "set")) { init_modules(&g_action, "set"); action = ACTION_SET; @@ -229,8 +229,7 @@ int main(int argc, char *argv[], char *e goto error; } init_log(gparam->log.log_file, veid, gparam->log.enable != NO, - verbose ? gparam->log.level + 2 : gparam->log.level, - quiet, "vzctl"); + gparam->log.level, quiet, verbose, "vzctl"); if ((ret = parse_action_opt(veid, action, argc, argv, cmd_p, action_nm))) { diff --git a/src/vzlist.c b/src/vzlist.c index 0a10fe0..1597357 100644 --- a/src/vzlist.c +++ b/src/vzlist.c @@ -1633,7 +1633,7 @@ int main(int argc, char **argv) } qsort(g_ve_list, n_ve_list, sizeof(*g_ve_list), id_sort_fn); } - init_log(NULL, 0, 0, 0, 0, NULL); + init_log(NULL, 0, 0, 0, 0, 0, NULL); if (build_field_order(f_order)) return 1; if (getuid()) { diff --git a/src/vzmemcheck.c b/src/vzmemcheck.c index cadeab7..e0045ce 100644 --- a/src/vzmemcheck.c +++ b/src/vzmemcheck.c @@ -201,7 +201,7 @@ int main(int argc, char **argv) break; } } - init_log(NULL, 0, 0, 0, 0, NULL); + init_log(NULL, 0, 0, 0, 0, 0, NULL); get_pagesize(); ret = calculate(numerator, verbose); exit(ret);