tools: add --loglevel option

jengelh · jengelh · commit c4dd52fb90be · 2025-07-25T21:35:37.000+02:00
diff --git a/doc/gromox-edb2mt.8 b/doc/gromox-edb2mt.8
@@ -24,6 +24,12 @@ Show a diagnostic tree view of the source data as it is being read.
 .TP
 \fB\-x\fP \fImbid\fP
 Extract the given mailbox from the .edb file.
+.TP
+\fB\-\-loglevel\fP \fIn\fP Maximum verbosity of general logging (not connected
+to \fB\-p\fP, \fB\-t\fP or \fB\-v\fP). 1=crit, 2=error, 3=warn, 4=notice,
+5=info, 6=debug.
+.br
+Default: \fI4\fP (notice)
 .SH Obtaining edb files
 On the Exchange server, stop the service known as "Microsoft Exchange
 Information Store" (as reported in services.msc) or
diff --git a/doc/gromox-eml2mt.8 b/doc/gromox-eml2mt.8
@@ -48,6 +48,12 @@ message. \fIn\fP is 1-based.
 Treat all file arguments as iCalendar input. This is the default if the program
 was invoked as gromox\-ical2mt.
 .TP
+\fB\-\-loglevel\fP \fIn\fP Maximum verbosity of general logging (not connected
+to \fB\-p\fP, \fB\-t\fP or \fB\-v\fP). 1=crit, 2=error, 3=warn, 4=notice,
+5=info, 6=debug.
+.br
+Default: \fI4\fP (notice)
+.TP
 \fB\-\-mail\fP
 Treat all file arguments as Internet Mail input. This is the default if the
 program was invoked as gromox\-eml2mt.
diff --git a/doc/gromox-exm2eml.8 b/doc/gromox-exm2eml.8
@@ -45,5 +45,11 @@ properties to stderr.
 \fB\-u\fP [\fIuser\fP]\fB@\fIdomin.example\fP
 Source mail store from which to load the message from. For the public folder of
 a domain, leave out the local part, i.e. use \fB@\fP\fIdomain.example\fP.
+.TP
+\fB\-\-loglevel\fP \fIn\fP Maximum verbosity of general logging (not connected
+to \fB\-p\fP, \fB\-t\fP or \fB\-v\fP). 1=crit, 2=error, 3=warn, 4=notice,
+5=info, 6=debug.
+.br
+Default: \fI4\fP (notice)
 .SH See also
 \fBgromox\fP(7), \fBgromox\-eml2mt\fP(8)
diff --git a/doc/gromox-kdb2mt.8 b/doc/gromox-kdb2mt.8
@@ -52,6 +52,12 @@ Show a diagnostic tree view of the source data as it is being read.
 Print message count progress while processing larger folders. This option has
 no effect if (the even more verbose) \fB\-t\fP option was used.
 .TP
+\fB\-\-loglevel\fP \fIn\fP Maximum verbosity of general logging (not connected
+to \fB\-p\fP, \fB\-t\fP or \fB\-v\fP). 1=crit, 2=error, 3=warn, 4=notice,
+5=info, 6=debug.
+.br
+Default: \fI4\fP (notice)
+.TP
 \fB\-\-user\-map\fP \fIfile\fP
 Use the given file to perform ACL mapping. See section "ACL Extraction" below
 for details.
diff --git a/doc/gromox-mt2exm.8 b/doc/gromox-mt2exm.8
@@ -61,6 +61,12 @@ raise an error if a to-be-created folder already exists. This behavior can be
 turned off with \-x. This option can be thought of what mkdir's \-p option
 would do.
 .TP
+\fB\-\-loglevel\fP \fIn\fP Maximum verbosity of general logging (not connected
+to \fB\-p\fP, \fB\-t\fP or \fB\-v\fP). 1=crit, 2=error, 3=warn, 4=notice,
+5=info, 6=debug.
+.br
+Default: \fI4\fP (notice)
+.TP
 \fB\-\-skip\-notif\fP
 Skip emitting MAPI notifications (when \-D is used). This is for development
 only.
diff --git a/doc/gromox-oxm2mt.8 b/doc/gromox-oxm2mt.8
@@ -19,6 +19,12 @@ Show properties in detail (enhances \fB\-t\fP).
 .TP
 \fB\-t\fP
 Show a diagnostic tree view of the source data as it is being read.
+.TP
+\fB\-\-loglevel\fP \fIn\fP Maximum verbosity of general logging (not connected
+to \fB\-p\fP, \fB\-t\fP or \fB\-v\fP). 1=crit, 2=error, 3=warn, 4=notice,
+5=info, 6=debug.
+.br
+Default: \fI4\fP (notice)
 .SH Examples
 Import of a message to drafts:
 .PP
diff --git a/doc/gromox-pff2mt.8 b/doc/gromox-pff2mt.8
@@ -45,6 +45,12 @@ to avoid polluting e.g. "QuickStep settings" (which may already have settings).
 \fB\-t\fP
 Show a diagnostic tree view of the source data as it is being read.
 .TP
+\fB\-\-loglevel\fP \fIn\fP Maximum verbosity of general logging (not connected
+to \fB\-p\fP, \fB\-t\fP or \fB\-v\fP). 1=crit, 2=error, 3=warn, 4=notice,
+5=info, 6=debug.
+.br
+Default: \fI4\fP (notice)
+.TP
 \fB\-\-with\-hidden\fP, \fB\-\-without\-hidden\fP
 This option controls the import of folders that have PR_ATTR_HIDDEN=1.
 .br
diff --git a/include/gromox/defs.h b/include/gromox/defs.h
@@ -51,6 +51,7 @@ enum gx_loglevel {
 	LV_NOTICE = 4,
 	LV_INFO = 5,
 	LV_DEBUG = 6,
+	MLOG_DEFAULT_LEVEL = LV_NOTICE,
 };
 
 enum {
diff --git a/lib/rfbl.cpp b/lib/rfbl.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-// SPDX-FileCopyrightText: 2021-2025 grommunio GmbH
+// SPDX-FileCopyrightText: 2021–2025 grommunio GmbH
 // This file is part of Gromox.
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -87,7 +87,7 @@ class hxmc_deleter {
 
 }
 
-static unsigned int g_max_loglevel = LV_NOTICE;
+static unsigned int g_max_loglevel = MLOG_DEFAULT_LEVEL;
 static std::mutex g_log_mutex;
 static std::unique_ptr<FILE, file_deleter> g_logfp;
 static bool g_log_tty, g_log_syslog;
diff --git a/tools/edb2mt.cpp b/tools/edb2mt.cpp
@@ -83,14 +83,15 @@ struct edb_folder {
 
 }
 
-static unsigned int g_list_mbox;
+static unsigned int g_list_mbox, g_mlog_level = MLOG_DEFAULT_LEVEL;
 static char *g_extract_mbox;
 
 static constexpr HXoption g_options_table[] = {
 	{nullptr, 'l', HXTYPE_NONE, &g_list_mbox, nullptr, nullptr, 0, "Show available mailboxes in database"},
 	{nullptr, 'p', HXTYPE_NONE | HXOPT_INC, &g_show_props, nullptr, nullptr, 0, "Show properties in detail (if -t)"},
 	{nullptr, 't', HXTYPE_NONE, &g_show_tree, nullptr, nullptr, 0, "Show tree-based analysis of the archive"},
 	{nullptr, 'x', HXTYPE_STRING, &g_extract_mbox, nullptr, nullptr, 0, "Extract the given mailbox", "ID/RK/GUID"},
+	{"loglevel", 0, HXTYPE_UINT, &g_mlog_level, {}, {}, {}, "Basic loglevel of the program", "N"},
 	HXOPT_AUTOHELP,
 	HXOPT_TABLEEND,
 };
@@ -676,6 +677,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 #endif
+	mlog_init(nullptr, nullptr, g_mlog_level, nullptr);
 	if (iconv_validate() != 0)
 		return EXIT_FAILURE;
 	textmaps_init(PKGDATADIR);
diff --git a/tools/eml2mt.cpp b/tools/eml2mt.cpp
@@ -45,13 +45,14 @@ enum {
 };
 
 static unsigned int g_import_mode = IMPORT_MAIL;
-static unsigned int g_oneoff, g_attach_decap;
+static unsigned int g_oneoff, g_attach_decap, g_mlog_level = MLOG_DEFAULT_LEVEL;
 static constexpr HXoption g_options_table[] = {
 	{nullptr, 'P', HXTYPE_NONE, &g_oxvcard_pedantic, nullptr, nullptr, 0, "Enable pedantic import mode"},
 	{nullptr, 'p', HXTYPE_NONE | HXOPT_INC, &g_show_props, nullptr, nullptr, 0, "Show properties in detail (if -t)"},
 	{nullptr, 't', HXTYPE_NONE, &g_show_tree, nullptr, nullptr, 0, "Show tree-based analysis of the archive"},
 	{"decap", 0, HXTYPE_UINT, &g_attach_decap, {}, {}, {}, "Decapsulate embedded message (1-based index)", "IDX"},
 	{"ical", 0, HXTYPE_VAL, &g_import_mode, nullptr, nullptr, IMPORT_ICAL, "Treat input as iCalendar"},
+	{"loglevel", 0, HXTYPE_UINT, &g_mlog_level, {}, {}, {}, "Basic loglevel of the program", "N"},
 	{"mail", 0, HXTYPE_VAL, &g_import_mode, nullptr, nullptr, IMPORT_MAIL, "Treat input as Internet Mail"},
 	{"mbox", 0, HXTYPE_VAL, &g_import_mode, {}, {}, IMPORT_MBOX, "Treat input as Unix mbox"},
 	{"oneoff", 0, HXTYPE_NONE, &g_oneoff, nullptr, nullptr, 0, "Resolve addresses to ONEOFF rather than EX addresses"},
@@ -309,6 +310,7 @@ int main(int argc, char **argv) try
 		terse_help();
 		return EXIT_FAILURE;
 	}
+	mlog_init(nullptr, nullptr, g_mlog_level, nullptr);
 	if (iconv_validate() != 0)
 		return EXIT_FAILURE;
 	textmaps_init(PKGDATADIR);
diff --git a/tools/exm2eml.cpp b/tools/exm2eml.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-// SPDX-FileCopyrightText: 2022-2024 grommunio GmbH
+// SPDX-FileCopyrightText: 2022–2025 grommunio GmbH
 // This file is part of Gromox.
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -42,14 +42,15 @@ enum {
 
 static std::shared_ptr<config_file> g_config_file;
 static char *g_username;
-static unsigned int g_export_mode = EXPORT_MAIL;
+static unsigned int g_export_mode = EXPORT_MAIL, g_mlog_level = MLOG_DEFAULT_LEVEL;
 static int g_allday_mode = -1;
 static constexpr HXoption g_options_table[] = {
 	{nullptr, 'Y', HXTYPE_INT, &g_allday_mode, nullptr, nullptr, 0, "Allday emission mode (default=-1, YMDHMS=0, YMD=1)"},
 	{nullptr, 'p', HXTYPE_NONE | HXOPT_INC, &g_show_props, nullptr, nullptr, 0, "Show properties in detail (if -t)"},
 	{nullptr, 't', HXTYPE_NONE, &g_show_tree, nullptr, nullptr, 0, "Show tree-based analysis of the archive"},
 	{nullptr, 'u', HXTYPE_STRING, &g_username, nullptr, nullptr, 0, "Username of store to export from", "EMAILADDR"},
 	{"ical", 0, HXTYPE_VAL, &g_export_mode, nullptr, nullptr, EXPORT_ICAL, "Export as calendar object"},
+	{"loglevel", 0, HXTYPE_UINT, &g_mlog_level, {}, {}, {}, "Basic loglevel of the program", "N"},
 	{"mail", 0, HXTYPE_VAL, &g_export_mode, nullptr, nullptr, EXPORT_MAIL, "Export as RFC5322 mail"},
 	{"mt", 0, HXTYPE_VAL, &g_export_mode, nullptr, nullptr, EXPORT_GXMT, "Export as Gromox mailbox transfer format"},
 	{"tnef", 0, HXTYPE_VAL, &g_export_mode, nullptr, nullptr, EXPORT_TNEF, "Export as TNEF object"},
@@ -127,6 +128,9 @@ int main(int argc, char **argv) try
 	}
 	if (g_allday_mode >= 0)
 		g_oxcical_allday_ymd = g_allday_mode;
+	mlog_init(nullptr, nullptr, g_mlog_level, nullptr);
+	if (iconv_validate() != 0)
+		return EXIT_FAILURE;
 	textmaps_init(PKGDATADIR);
 	g_config_file = config_file_prg(nullptr, "midb.cfg",
 	                exm2eml_cfg_defaults);
diff --git a/tools/kdb2mt.cpp b/tools/kdb2mt.cpp
@@ -145,6 +145,7 @@ static int do_item(driver &, unsigned int, const parent_desc &, kdb_item &);
 static char *g_sqlhost, *g_sqlport, *g_sqldb, *g_sqluser, *g_atxdir;
 static char *g_srcguid, *g_srcmbox, *g_srcmro, *g_user_map_file;
 static unsigned int g_splice, g_level1_fan = 10, g_level2_fan = 20, g_verbose;
+static unsigned int g_mlog_level = MLOG_DEFAULT_LEVEL;
 static enum aclconv g_acl_conv = aclconv::automatic;
 static int g_with_hidden = -1;
 static std::vector<uint32_t> g_only_objs;
@@ -180,6 +181,7 @@ static constexpr HXoption g_options_table[] = {
 	{"acl", 0, HXTYPE_STRING, nullptr, nullptr, acl_cb, 0, "Conversion for ACLs (auto, no/noextract, extract, convert)", "MODE"},
 	{"l1", 0, HXTYPE_UINT, &g_level1_fan, nullptr, nullptr, 0, "L1 fan number for attachment directories of type files_v1 (default: 10)", "N"},
 	{"l2", 0, HXTYPE_UINT, &g_level1_fan, nullptr, nullptr, 0, "L2 fan number for attachment directories of type files_v1 (default: 20)", "N"},
+	{"loglevel", 0, HXTYPE_UINT, &g_mlog_level, {}, {}, {}, "Basic loglevel of the program", "N"},
 	{"mbox-guid", 0, HXTYPE_STRING, &g_srcguid, nullptr, nullptr, 0, "Lookup source mailbox by GUID", "GUID"},
 	{"mbox-mro", 0, HXTYPE_STRING, &g_srcmro, nullptr, nullptr, 0, "Lookup source mailbox by MRO", "NAME"},
 	{"mbox-name", 0, HXTYPE_STRING, &g_srcmbox, nullptr, nullptr, 0, "Lookup source mailbox by username (requires --user-map)", "NAME"},
@@ -1467,6 +1469,7 @@ int main(int argc, char **argv)
 	    HXOPT_USAGEONERR) != HXOPT_ERR_SUCCESS)
 		return EXIT_FAILURE;
 	auto cl_0 = HX::make_scope_exit([=]() { HX_zvecfree(argv); });
+	mlog_init(nullptr, nullptr, g_mlog_level, nullptr);
 	if (iconv_validate() != 0)
 		return EXIT_FAILURE;
 	textmaps_init(PKGDATADIR);
diff --git a/tools/mt2exm.cpp b/tools/mt2exm.cpp
@@ -46,7 +46,7 @@ static uint8_t g_splice;
 static uint64_t g_anchor_folder; /* GCV */
 static unsigned int g_oexcl = 1, g_repeat_iter = 1;
 static unsigned int g_do_delivery, g_skip_notif, g_skip_rules, g_twostep;
-static unsigned int g_continuous_mode, g_mrautoproc;
+static unsigned int g_continuous_mode, g_mrautoproc, g_mlog_level = MLOG_DEFAULT_LEVEL;
 
 static constexpr static_module g_dfl_svc_plugins[] = {
 	{"libgxs_mysql_adaptor.so", SVC_mysql_adaptor},
@@ -67,6 +67,7 @@ static constexpr HXoption g_options_table[] = {
 	{nullptr, 'u', HXTYPE_STRING, &g_username, nullptr, nullptr, 0, "Username of store to import to", "EMAILADDR"},
 	{nullptr, 'v', HXTYPE_NONE | HXOPT_INC, &g_verbose_create, nullptr, nullptr, 0, "Be more verbose"},
 	{nullptr, 'x', HXTYPE_VAL, &g_oexcl, nullptr, nullptr, 0, "Disable O_EXCL like behavior for non-spliced folders"},
+	{"loglevel", 0, HXTYPE_UINT, &g_mlog_level, {}, {}, {}, "Basic loglevel of the program", "N"},
 	{"repeat", 0, HXTYPE_UINT, &g_repeat_iter, {}, {}, 0, "For testing purposes, import each message N times", "N"},
 	{"skip-notif", 0, HXTYPE_NONE, &g_skip_notif, nullptr, nullptr, 0, "Skip emission of notifications (if -D)"},
 	{"skip-rules", 0, HXTYPE_NONE, &g_skip_rules, nullptr, nullptr, 0, "Skip execution of rules (if -D)"},
@@ -440,6 +441,7 @@ int main(int argc, char **argv) try
 		terse_help();
 		return EXIT_FAILURE;
 	}
+	mlog_init(nullptr, nullptr, g_mlog_level, nullptr);
 	if (g_twostep)
 		g_do_delivery = true;
 	if (g_do_delivery && g_anchor_folder != 0)
diff --git a/tools/oxm2mt.cpp b/tools/oxm2mt.cpp
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
-// SPDX-FileCopyrightText: 2022-2025 grommunio GmbH
+// SPDX-FileCopyrightText: 2022–2025 grommunio GmbH
 // This file is part of Gromox.
 #include <cstdint>
 #include <cstdio>
@@ -59,12 +59,13 @@ using bin_ptr       = std::unique_ptr<BINARY, bin_del>;
 
 }
 
-static unsigned int g_attach_decap;
+static unsigned int g_attach_decap, g_mlog_level = MLOG_DEFAULT_LEVEL;
 
 static constexpr HXoption g_options_table[] = {
 	{nullptr, 'p', HXTYPE_NONE | HXOPT_INC, &g_show_props, nullptr, nullptr, 0, "Show properties in detail (if -t)"},
 	{nullptr, 't', HXTYPE_NONE, &g_show_tree, nullptr, nullptr, 0, "Show tree-based analysis of the archive"},
 	{"decap", 0, HXTYPE_UINT, &g_attach_decap, {}, {}, {}, "Decapsulate embedded message (1-based index)", "IDX"},
+	{"loglevel", 0, HXTYPE_UINT, &g_mlog_level, {}, {}, {}, "Basic loglevel of the program", "N"},
 	HXOPT_AUTOHELP,
 	HXOPT_TABLEEND,
 };
@@ -655,6 +656,7 @@ int main(int argc, char **argv)
 			"You probably wanted to redirect output into a file or pipe.\n");
 		return EXIT_FAILURE;
 	}
+	mlog_init(nullptr, nullptr, g_mlog_level, nullptr);
 	if (iconv_validate() != 0)
 		return EXIT_FAILURE;
 	textmaps_init(PKGDATADIR);
diff --git a/tools/pff2mt.cpp b/tools/pff2mt.cpp
@@ -131,7 +131,7 @@ enum {
 
 static std::vector<uint32_t> g_only_objs;
 static gi_folder_map_t g_folder_map;
-static unsigned int g_splice;
+static unsigned int g_splice, g_mlog_level = MLOG_DEFAULT_LEVEL;
 static int g_with_hidden = -1, g_with_assoc;
 static const char *g_ascii_charset;
 static size_t g_msg_count;
@@ -145,6 +145,7 @@ static constexpr HXoption g_options_table[] = {
 	{nullptr, 'p', HXTYPE_NONE | HXOPT_INC, &g_show_props, nullptr, nullptr, 0, "Show properties in detail (if -t)"},
 	{nullptr, 's', HXTYPE_NONE, &g_splice, nullptr, nullptr, 0, "Splice PFF objects into existing store hierarchy"},
 	{nullptr, 't', HXTYPE_NONE, &g_show_tree, nullptr, nullptr, 0, "Show tree-based analysis of the archive"},
+	{"loglevel", 0, HXTYPE_UINT, &g_mlog_level, {}, {}, {}, "Basic loglevel of the program", "N"},
 	{"with-assoc", 0, HXTYPE_VAL, &g_with_assoc, nullptr, nullptr, 1, "Do import FAI messages"},
 	{"without-assoc", 0, HXTYPE_VAL, &g_with_assoc, nullptr, nullptr, 0, "Skip FAI messages [default]"},
 	{"with-hidden", 0, HXTYPE_VAL, &g_with_hidden, nullptr, nullptr, 1, "Do import folders with PR_ATTR_HIDDEN"},
@@ -1294,6 +1295,7 @@ int main(int argc, char **argv)
 			"You probably wanted to redirect output into a file or pipe.\n");
 		return EXIT_FAILURE;
 	}
+	mlog_init(nullptr, nullptr, g_mlog_level, nullptr);
 	if (iconv_validate() != 0)
 		return EXIT_FAILURE;
 	textmaps_init(PKGDATADIR);
