From bc290e5bc69ff5b3bb488ad50ec5e353fdb96946 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 16 Apr 2023 12:37:40 -0400 Subject: [PATCH] diag: Add verbose opt to spark cli Applies to logging during startup, until [logging] config is initialized --- src/client/spark/Daemons/ShellServices.cs | 6 ++- src/client/spark/ShellBootstrapper.cs | 5 +- src/client/spark/Spark.Cli/SparkCmdOpts.cs | 5 ++ .../spark/Spark.Cli/SparkCmdOptsExport.cs | 13 +++++ .../Utility/BTSApplicationBootstrapper.cs | 6 ++- src/client/spark/view/Shell/ShellModel.cs | 17 +++---- src/client/spark_api/api/ServiceContext.cs | 12 +++-- src/client/spark_core/config/Configuration.cs | 5 +- src/client/spark_core/utils_api/BTS.cs | 20 ++++++-- .../spark_core/utils_api/BTSNativeMethods.cs | 6 ++- src/lib/api/core/ApiClientInterop.cpp | 3 +- src/lib/config/ConfigLog.cpp | 51 ++++++++++++------- src/lib/config/ConfigLog.h | 12 +++-- src/lib/config/ConfigQuerier.cpp | 3 +- src/lib/config/ConfigurationState.cpp | 22 ++++---- src/lib/config/ConfigurationState.h | 11 +++- src/lib/config/config.cpp | 41 +++++++++++---- src/lib/config/config.h | 26 ++++++++-- src/lib/config/tests/config_tests.cpp | 28 +++++----- src/lib/logging/logging.h | 26 ++++++++++ 20 files changed, 228 insertions(+), 90 deletions(-) create mode 100644 src/client/spark/Spark.Cli/SparkCmdOptsExport.cs diff --git a/src/client/spark/Daemons/ShellServices.cs b/src/client/spark/Daemons/ShellServices.cs index 330b8b99a..01fbb749b 100644 --- a/src/client/spark/Daemons/ShellServices.cs +++ b/src/client/spark/Daemons/ShellServices.cs @@ -16,8 +16,10 @@ using System.Composition; namespace Spark { class ShellServices { - public ShellServices([Import("config_source")]string config_source) => - context = new(config_source); + public ShellServices( + [Import("config_source")] string config_source, [Import("verbose")] bool verbose) { + context = new(config_source, verbose); + } [Export] public ServiceContext context { get; } diff --git a/src/client/spark/ShellBootstrapper.cs b/src/client/spark/ShellBootstrapper.cs index 95908b210..aa639c4ba 100644 --- a/src/client/spark/ShellBootstrapper.cs +++ b/src/client/spark/ShellBootstrapper.cs @@ -23,8 +23,9 @@ string user = null, string password = null, string config_source = null, - bool? restore_workspace = null - ) : base(config_source) { + bool? restore_workspace = null, + bool verbose = false + ) : base(config_source, verbose) { // Get the LoginModel instance on this thread to make sure it performs syncronous config initialization. var login_model = LoginModel.init(config_source); // Show the dialog on a background thread so animations aren't blocked during the main application startup diff --git a/src/client/spark/Spark.Cli/SparkCmdOpts.cs b/src/client/spark/Spark.Cli/SparkCmdOpts.cs index bd4c698ed..459749644 100644 --- a/src/client/spark/Spark.Cli/SparkCmdOpts.cs +++ b/src/client/spark/Spark.Cli/SparkCmdOpts.cs @@ -42,6 +42,11 @@ namespace Spark.Cli { [Option(_SPARKD_OPT_NAME, MetaValue = "URL", HelpText = "The config server url")] public string? sparkd { get; set; } + [Option( + "verbose", + HelpText = "Enable verbose logging during startup (until [logging] config is loaded)")] + public bool verbose { get; set; } + /// /// Conform opts to modern cli for backwards compatibility /// diff --git a/src/client/spark/Spark.Cli/SparkCmdOptsExport.cs b/src/client/spark/Spark.Cli/SparkCmdOptsExport.cs new file mode 100644 index 000000000..1b578bc28 --- /dev/null +++ b/src/client/spark/Spark.Cli/SparkCmdOptsExport.cs @@ -0,0 +1,13 @@ +#nullable enable +namespace Spark.Cli { + using System.Composition; + + [Export] + class SparkCmdOptsExport { + [Export("config_source")] + public string? config_source { get; set; } + + [Export("verbose")] + public bool verbose { get; set; } + } +} diff --git a/src/client/spark/core/Utility/BTSApplicationBootstrapper.cs b/src/client/spark/core/Utility/BTSApplicationBootstrapper.cs index a4e5c30e5..c39e74735 100644 --- a/src/client/spark/core/Utility/BTSApplicationBootstrapper.cs +++ b/src/client/spark/core/Utility/BTSApplicationBootstrapper.cs @@ -10,6 +10,7 @@ using System.Windows.Threading; namespace mbts.ui { public abstract class BTSApplicationBootstrapper : IDisposable { readonly string _config_source; + readonly bool _verbose; private ShellModel _model; @@ -18,8 +19,9 @@ namespace mbts.ui { Dispatcher.CurrentDispatcher.UnhandledException += CurrentDispatcher_HandleClipboardError; } - protected BTSApplicationBootstrapper(string config_source = null) { + protected BTSApplicationBootstrapper(string config_source = null, bool verbose = false) { _config_source = config_source; + _verbose = verbose; } public static void CurrentDispatcher_HandleClipboardError(object sender, DispatcherUnhandledExceptionEventArgs e) { @@ -43,7 +45,7 @@ namespace mbts.ui { public void Run() { _model = new ShellModel(); - _model.Initialize(_config_source); + _model.Initialize(_config_source, _verbose); CreateShell(_model); } diff --git a/src/client/spark/view/Shell/ShellModel.cs b/src/client/spark/view/Shell/ShellModel.cs index 726c771df..28c034bae 100644 --- a/src/client/spark/view/Shell/ShellModel.cs +++ b/src/client/spark/view/Shell/ShellModel.cs @@ -14,6 +14,7 @@ using mbts.ui.shell; using Spark.Api.Reactive; + using Spark.Cli; using Spark.Core.Data; using System; @@ -28,12 +29,6 @@ using System.Runtime.Loader; using System.Text; - [Export] - public class ConfigSourceExporter { - [Export("config_source")] - public string config_source { get; set; } - } - // Models a generic multi-window host public class ShellModel : IDisposable { Lazy _container = new Lazy(create_container); @@ -59,8 +54,8 @@ public ISecurityMetadataStore security_metadata_store => SecurityMetadataStore.instance; - public void Initialize(string config_source) { - PerformMEFComposition(config_source); + public void Initialize(string config_source, bool verbose) { + PerformMEFComposition(config_source, verbose); InitInitializers(); } @@ -99,12 +94,14 @@ return value; } - void PerformMEFComposition(string config_source) { + void PerformMEFComposition(string config_source, bool verbose) { Log.Ui.info($"Generating MEF dependencies for the shell " + $"({typeof(IInitializable)}s, {typeof(IShellModule)}s, " + $"{typeof(IShellDaemon)}s, etc.)"); try { - container.GetExport().config_source = config_source; + var cmd_opts = container.GetExport(); + cmd_opts.config_source = config_source; + cmd_opts.verbose = verbose; container.SatisfyImports(this); } catch (ReflectionTypeLoadException rtlex) { var message = new StringBuilder(rtlex.ToString()); diff --git a/src/client/spark_api/api/ServiceContext.cs b/src/client/spark_api/api/ServiceContext.cs index 9b22d1a34..f7bb083d3 100644 --- a/src/client/spark_api/api/ServiceContext.cs +++ b/src/client/spark_api/api/ServiceContext.cs @@ -12,8 +12,8 @@ namespace bts.api.core { IntPtr _qbus; AuthToken? _token; - public ServiceContext(string? config_source = null) { - BTS.init(config_source); + public ServiceContext(string? config_source = null, bool verbose = false) { + BTS.init(config_source, verbose); _qbus = ApiNativeMethods.api_create_quickbus(null, 0); } @@ -26,9 +26,13 @@ namespace bts.api.core { internal IntPtr native_context => _qbus; - public static ServiceContext create(string? config_server = null) { + public static ServiceContext create( + string? config_server = null, + LogLevel console_level = LogLevel.NoLog, + LogLevel syslog_level = LogLevel.NoLog + ) { var args = Environment.GetCommandLineArgs(); - BTS.init(config_server, args); + BTS.init(config_server, console_level, syslog_level, args); var qbus = ApiNativeMethods.api_create_quickbus(null, 0); return new ServiceContext(qbus); } diff --git a/src/client/spark_core/config/Configuration.cs b/src/client/spark_core/config/Configuration.cs index 446184364..d509b2b92 100644 --- a/src/client/spark_core/config/Configuration.cs +++ b/src/client/spark_core/config/Configuration.cs @@ -66,7 +66,7 @@ namespace mbts.config { } public static void initialize_for_test(string config = "") { - _raw_initialize_for_test(config); + _raw_initialize_for_test(config, (int)LogLevel.NoLog, (int)LogLevel.NoLog); // still need init_spark_lib BTS.init(); _state = State.OK; @@ -128,7 +128,8 @@ namespace mbts.config { static extern bool _initialize_nothrow(StringBuilder buffer, int length); [DllImport("libspark", EntryPoint = "initialize_for_test")] - static extern void _raw_initialize_for_test(string buffer); + static extern void _raw_initialize_for_test( + string buffer, int console_level, int syslog_level); [DllImport("libspark", EntryPoint = "reset")] static extern void _reset(); diff --git a/src/client/spark_core/utils_api/BTS.cs b/src/client/spark_core/utils_api/BTS.cs index 3f680124c..b06890ea4 100644 --- a/src/client/spark_core/utils_api/BTS.cs +++ b/src/client/spark_core/utils_api/BTS.cs @@ -9,17 +9,29 @@ namespace bts { static int _needs_init_spark_lib = 0; - public static void init(string config_source = null) { + public static void init(string config_source = null, bool verbose = false) { var args = Environment.GetCommandLineArgs(); - init(config_source, args); + var (console_level, syslog_level) = verbose ? + (LogLevel.Info, LogLevel.Diag) : + (LogLevel.NoLog, LogLevel.NoLog); + init(config_source, console_level, syslog_level, args); } - public static void init(string config_source = null, params string[] args) { + public static void init( + string config_source = null, + LogLevel console_level = LogLevel.NoLog, + LogLevel syslog_level = LogLevel.NoLog, + params string[] args + ) { utils.BTSNativeMethods.provide_command_line(args, args.Length); var buffer = new StringBuilder(4096); bool config_ok = utils.BTSNativeMethods.initialize_nothrow( - config_source ?? string.Empty, buffer, buffer.Capacity); + config_source ?? string.Empty, + (int)console_level, + (int)syslog_level, + buffer, + buffer.Capacity); if (!config_ok) { throw new ApplicationException(buffer.ToString()); } diff --git a/src/client/spark_core/utils_api/BTSNativeMethods.cs b/src/client/spark_core/utils_api/BTSNativeMethods.cs index 1a6eee190..641624bc7 100644 --- a/src/client/spark_core/utils_api/BTSNativeMethods.cs +++ b/src/client/spark_core/utils_api/BTSNativeMethods.cs @@ -28,6 +28,10 @@ namespace bts.utils [DllImport("libspark")] public static extern bool initialize_nothrow( - string config_source, StringBuilder buffer, int length); + string config_source, + int console_level, + int syslog_level, + StringBuilder buffer, + int length); } } diff --git a/src/lib/api/core/ApiClientInterop.cpp b/src/lib/api/core/ApiClientInterop.cpp index 328d8f680..aea86705c 100644 --- a/src/lib/api/core/ApiClientInterop.cpp +++ b/src/lib/api/core/ApiClientInterop.cpp @@ -37,7 +37,8 @@ CAPI Quickbus *api_create_quickbus(const char *qbconfig, long length) { // If config hasn't been initialized yet do it now and suppress exceptions. // When we're called from a nuget package we may not have defaults which can // cause errors - config::initialize_nothrow("", nullptr, 0); + config::initialize_nothrow( + "", bts::Error.ordinal, bts::Warn.ordinal, nullptr, 0); config::QuickbusNodeCfg cfg; if (length > 0 && qbconfig != nullptr && diff --git a/src/lib/config/ConfigLog.cpp b/src/lib/config/ConfigLog.cpp index 2dfd7495b..5c2141849 100644 --- a/src/lib/config/ConfigLog.cpp +++ b/src/lib/config/ConfigLog.cpp @@ -6,17 +6,8 @@ namespace bts { namespace config { namespace internal { -struct ConfigLog::PImpl { - PImpl() - : print_errors(true), logger_hub("config_logger"), - logger(logger_hub.make_logger()) {} - - bool print_errors; - log::LoggerHub logger_hub; - log::Logger &logger; -}; - -ConfigLog::ConfigLog() : me(new PImpl()) { +static log::LoggingConfig mk_config( + log::Level console_level, log::Level syslog_level) { log::LoggingConfig cfg; cfg.level_names = {{Diag, "Diag"}, {Info, "Info"}, {Warn, "Warn"}, {Error, "Error"}, {Fatal, "Fatal"}, {Sys, "Sys"}}; @@ -29,12 +20,31 @@ ConfigLog::ConfigLog() : me(new PImpl()) { l = Warn; cfg.deployment_type = "Config"; - f[log::Cfg.ordinal] = Warn; + f[log::Cfg.ordinal] = console_level; cfg.sinks["console"] = std::make_pair(log::console_sink(cfg), f); - f[log::Cfg.ordinal] = Info; + f[log::Cfg.ordinal] = syslog_level; cfg.sinks["syslog"] = std::make_pair(log::syslog_sink(cfg), f); - me->logger_hub.config(cfg); + return cfg; +} +struct ConfigLog::PImpl { + PImpl() + : is_enabled(true), logger_hub("config_logger"), + logger(logger_hub.make_logger()) {} + + bool is_enabled; + log::LoggerHub logger_hub; + log::Logger &logger; +}; + +ConfigLog::ConfigLog(bool verbose) + : ConfigLog(verbose ? Diag : Warn, verbose ? Diag : Info, verbose) {} + +ConfigLog::ConfigLog( + bts::log::Level console_level, bts::log::Level syslog_level, bool is_enabled) + : me(std::make_unique()) { + me->is_enabled = is_enabled; + me->logger_hub.config(mk_config(console_level, syslog_level)); start(); } @@ -42,25 +52,28 @@ void ConfigLog::start() { me->logger_hub.start(); } ConfigLog::~ConfigLog() { me->logger.mark_inactive(); } -bool ConfigLog::print_errors() const { return me->print_errors; } -void ConfigLog::set_print_errors(bool value) { me->print_errors = value; } +bool ConfigLog::is_enabled() const { return me->is_enabled; } +void ConfigLog::set_is_enabled(bool value) { me->is_enabled = value; } void ConfigLog::info(const std::string &msg) { - if (me->print_errors) + if (me->is_enabled) { me->logger.enqueue( log::log_ts(), log::Cfg, Info, __FILE__, __LINE__, "{0}", msg); + } } void ConfigLog::error(const std::string &msg) { - if (me->print_errors) + if (me->is_enabled) { me->logger.enqueue( log::log_ts(), log::Cfg, Error, __FILE__, __LINE__, "{0}", msg); + } } void ConfigLog::warning(const std::string &msg) { - if (me->print_errors) + if (me->is_enabled) { me->logger.enqueue( log::log_ts(), log::Cfg, Warn, __FILE__, __LINE__, "{0}", msg); + } } // diff --git a/src/lib/config/ConfigLog.h b/src/lib/config/ConfigLog.h index eeebc37e3..b34f019cb 100644 --- a/src/lib/config/ConfigLog.h +++ b/src/lib/config/ConfigLog.h @@ -1,5 +1,6 @@ #pragma once +#include "lib/logging/Common.h" #include "lib/utils/bts_no_copy.h" #include @@ -22,15 +23,20 @@ class IConfigLog { // To allow config diagnostic logging class ConfigLog : public IConfigLog { public: - ConfigLog(); + explicit ConfigLog(bool verbose = false); + ConfigLog( + bts::log::Level console_level, + bts::log::Level syslog_level, + bool is_enabled); + ~ConfigLog(); void info(const std::string &msg); void error(const std::string &msg); void warning(const std::string &msg); - bool print_errors() const; - void set_print_errors(bool value); + bool is_enabled() const; + void set_is_enabled(bool value); private: void start(); diff --git a/src/lib/config/ConfigQuerier.cpp b/src/lib/config/ConfigQuerier.cpp index 5d63c30a4..514c7e3cd 100644 --- a/src/lib/config/ConfigQuerier.cpp +++ b/src/lib/config/ConfigQuerier.cpp @@ -97,7 +97,8 @@ void run_config_query( void ConfigQuerier::init_(bool verbose) { char buffer[4096] = {0}; utils::TimeStamp start = utils::TimeStamp::now(); - bool success = config::initialize_nothrow("", buffer, sizeof(buffer)); + bool success = config::initialize_nothrow( + "", bts::Warn.ordinal, bts::Warn.ordinal, buffer, sizeof(buffer)); double time = (utils::TimeStamp::now() - start).seconds(); if (success) { diff --git a/src/lib/config/ConfigurationState.cpp b/src/lib/config/ConfigurationState.cpp index 42867c60f..66d4147fc 100644 --- a/src/lib/config/ConfigurationState.cpp +++ b/src/lib/config/ConfigurationState.cpp @@ -9,6 +9,7 @@ #include "lib/collections/Contains.h" #include "lib/core/FMT.h" #include "lib/io/ProtoPrinter.h" +#include "lib/logging/logging.h" #include "lib/os/os.h" #include "lib/utils/bts_array_size.h" #include "lib/utils/bts_assert.h" @@ -357,7 +358,7 @@ void check_rule( } void ConfigurationState::check_rules() { - initialize(""); + initialize("", bts::Error, bts::Warn); std::vector>::iterator iter; for (iter = _config_chain.begin(); iter != _config_chain.end(); ++iter) { proto::Message *message = (*iter).get(); @@ -366,15 +367,16 @@ void ConfigurationState::check_rules() { check_rule(_defaults.get(), _rule_engine); } -void ConfigurationState::initialize_settings(string config_source) { +void ConfigurationState::initialize_settings( + string config_source, + bts::log::Level console_verbosity, + bts::log::Level syslog_verbosity) { std::lock_guard lock(_initialization_mutex); if (_is_initialized) return; - ConfigLog log; + ConfigLog log{console_verbosity, syslog_verbosity, true}; log.info(FMT("Initializing settings from '{}'", config_source)); - // For verbose config logs, uncomment line below - // log.set_print_errors(true); initialize_defaults(log); if (config_source.empty()) { @@ -420,7 +422,6 @@ int ConfigurationState::load(const std::string &url, IConfigLog &log) { std::shared_ptr new_message(_prototype->New()); bool loaded = false; - log.info(FMT("Loading '{}'", url)); loaded = load_message(url, *new_message.get(), log, *_deferred_queue.get()); if (_host.empty() || _host == "localhost") { const auto old_host = _host; @@ -450,9 +451,12 @@ int ConfigurationState::load(const std::string &url, IConfigLog &log) { } int ConfigurationState::load_string( - const std::string &values, bool print_errors) { + const std::string &values, + log::Level console_verbosity, + log::Level syslog_verbosity) { ConfigLog log; - log.set_print_errors(print_errors); + log.set_is_enabled( + console_verbosity != bts::NoLog || syslog_verbosity != bts::NoLog); initialize_defaults(log); std::shared_ptr new_message(_prototype->New()); @@ -939,7 +943,7 @@ int load_directory( IConfigLog &log, ConfigValueQueue &lookup) { LogAggregator aggregate_log(log); - aggregate_log.info(FMT("Loading config dir from '{}'", url)); + aggregate_log.info(FMT("Loading config dir '{}'", url)); const char last_char = url.at(url.length() - 1); if (last_char != '/') { diff --git a/src/lib/config/ConfigurationState.h b/src/lib/config/ConfigurationState.h index e41a53717..136f45c7d 100644 --- a/src/lib/config/ConfigurationState.h +++ b/src/lib/config/ConfigurationState.h @@ -7,6 +7,7 @@ #include "ConfigurationException.h" #include "lib/expression/ExpressionEvaluator.h" #include "lib/expression/Value.h" +#include "lib/logging/logging.h" #include "text_format/text_format.h" #include @@ -60,10 +61,16 @@ class ConfigurationState { * @param config_source The source from which to load values. Can be a path * (file or dir), or URL (config server). */ - void initialize_settings(std::string config_source = ""); + void initialize_settings( + std::string config_source = "", + bts::log::Level console_verbosity = bts::NoLog, + bts::log::Level syslog_verbosity = bts::NoLog); int load(const std::string &url, IConfigLog &); - int load_string(const std::string &values, bool print_errors = false); + int load_string( + const std::string &values, + log::Level console_verbosity = bts::NoLog, + log::Level syslog_verbosity = bts::NoLog); void reset(); std::vector get_fields( diff --git a/src/lib/config/config.cpp b/src/lib/config/config.cpp index e107b8474..766027492 100644 --- a/src/lib/config/config.cpp +++ b/src/lib/config/config.cpp @@ -20,6 +20,8 @@ namespace bts { namespace config { using std::string; +using std::int32_t; +using LogLevel = bts::log::Level; internal::ConfigurationState config_state; @@ -27,18 +29,32 @@ internal::ConfigurationState config_state; // Public API ////////////////////////////////////////// -extern "C" BTS_EXPORT void initialize(const char *config_source) { - config_state.initialize_settings(string{config_source}); +extern "C" BTS_EXPORT void initialize( + const char *config_source, int32_t console_level, int32_t syslog_level) { + initialize( + string{config_source}, log::log_level_from_int32(console_level), + log::log_level_from_int32(syslog_level)); +} + +void initialize( + const string &config_source, + LogLevel console_level, + LogLevel syslog_level) { + config_state.initialize_settings(config_source, console_level, syslog_level); } extern "C" BTS_EXPORT bool initialize_nothrow( - const char *config_source, char *error_message, size_t len) { + const char *config_source, + int32_t console_level, + int32_t syslog_level, + char *error_message, + std::size_t length) { try { - initialize(config_source); + initialize(config_source, console_level, syslog_level); } catch (std::exception &e) { std::string msg = e.what(); - if (msg.size() < len) { - os::strncpy(error_message, msg.c_str(), len); + if (msg.size() < length) { + os::strncpy(error_message, msg.c_str(), length); } return false; } @@ -103,12 +119,17 @@ namespace internal { // Functions used in testing ////////////////////////////////////////// -extern "C" BTS_EXPORT void initialize_for_test(const char *config) { - initialize_for_test(std::string(config), false); +extern "C" BTS_EXPORT void initialize_for_test( + const char *config, int32_t console_level, int32_t syslog_level) { + initialize_for_test( + string(config), bts::log::log_level_from_int32(console_level), + bts::log::log_level_from_int32(syslog_level)); } -void initialize_for_test(const std::string &values, bool print_errors) { + +void initialize_for_test( + const string &values, LogLevel console_level, LogLevel syslog_level) { config_state.reset(); - config_state.load_string(values, print_errors); + config_state.load_string(values, console_level, syslog_level); } extern "C" BTS_EXPORT void reset() { config_state.reset(); } diff --git a/src/lib/config/config.h b/src/lib/config/config.h index 77934b0eb..502728b52 100644 --- a/src/lib/config/config.h +++ b/src/lib/config/config.h @@ -1,9 +1,11 @@ #ifndef BTS_CONFIG_H_ #define BTS_CONFIG_H_ +#include "lib/logging/logging.h" #include "lib/utils/bts_export.h" #include "lib/utils/checked_cast.h" +#include #include #include @@ -27,12 +29,24 @@ namespace config { // config can result in network requests this function is available for // applications that want to manage pauses in execution. Ex: initialize() on a // background thread so that config::get() is fast on a UI thread -extern "C" BTS_EXPORT void initialize(const char *config_path); +extern "C" BTS_EXPORT void initialize( + const char *config_path, + std::int32_t console_level, + std::int32_t syslog_level); + +void initialize( + const std::string &config_source, + bts::log::Level console_level = bts::Error, + bts::log::Level syslog_level = bts::Warn); // Calls initialize() but catches any thrown exception and copies it to the // provided buffer extern "C" BTS_EXPORT bool initialize_nothrow( - const char *config_source, char *error_msg, size_t length); + const char *config_source, + std::int32_t console_level, + std::int32_t syslog_level, + char *error_message, + size_t length); std::vector get_fields( const std::vector keys = {}, @@ -73,9 +87,13 @@ namespace internal { // Initialize configuration state from a string instead of from the filesystem. // defaults.conf will still be loaded. Calling this a second time clears all // values from previous initialization -extern "C" BTS_EXPORT void initialize_for_test(const char *config); +extern "C" BTS_EXPORT void initialize_for_test( + const char *config, std::int32_t console_level, std::int32_t syslog_level); + void initialize_for_test( - const std::string &configuration, bool print_errors = true); + const std::string &values, + log::Level console_level = Error, + log::Level syslog_level = Warn); // Releases all resources and returns config to factory defaults extern "C" BTS_EXPORT void reset(); diff --git a/src/lib/config/tests/config_tests.cpp b/src/lib/config/tests/config_tests.cpp index ed5c0119d..df70599aa 100644 --- a/src/lib/config/tests/config_tests.cpp +++ b/src/lib/config/tests/config_tests.cpp @@ -3,6 +3,7 @@ #include "../ConfigurationException.h" #include "../ConfigurationState.h" #include "../config.h" +#include "lib/core/FMT.h" #include "lib/expression/ParserExceptions.h" #include "lib/utils/bts_assert.h" #include "lib/utils/is_unittest_environment.h" @@ -97,7 +98,7 @@ TEST_CASE("Configuration Tests", "[config]") { bool error = false; try { - initialize_for_test("include: \"" + config_b.path() + "\"", false); + initialize_for_test(FMT(R"(include: "{}")", config_b.path())); } catch (const ConfigurationException &err) { std::string what = err.what(); bts_assert(what.find("Expected identifier.") != std::string::npos); @@ -331,12 +332,13 @@ TEST_CASE("Configuration Tests", "[config]") { } SECTION("built_in_properties_test") { - initialize_for_test("Foo { \n" - " rule: \"SystemConfig.unittest_environment == true \"\n" - " value {\n" - " name: \"unit tests\"\n" - " }\n" - "}\n"); + initialize_for_test( + "Foo { \n" + " rule: \"SystemConfig.unittest_environment == true \"\n" + " value {\n" + " name: \"unit tests\"\n" + " }\n" + "}\n"); REQUIRE(get().name() == "unit tests"); } @@ -344,13 +346,11 @@ TEST_CASE("Configuration Tests", "[config]") { SECTION("nonbreaking_space_test") { bool parse_error = false; try { - initialize_for_test( - "Foo { " - " value {\xA0\xA0 " - " name: \"valid name\"" - " \xA0 }" - "} ", - false); + initialize_for_test("Foo { " + " value {\xA0\xA0 " + " name: \"valid name\"" + " \xA0 }" + "} "); } catch (const bts::config::ConfigurationException &) { parse_error = true; } diff --git a/src/lib/logging/logging.h b/src/lib/logging/logging.h index acfbb25d0..15fdd8c1b 100644 --- a/src/lib/logging/logging.h +++ b/src/lib/logging/logging.h @@ -8,6 +8,7 @@ #include #include +#include #include namespace bts { @@ -65,6 +66,8 @@ struct LoggerHandle { Logger *logger; }; +constexpr Level log_level_from_int32(std::int32_t value); + struct CharPtrWrapper { const char *ptr; }; @@ -102,6 +105,29 @@ class LoggingConfigPoller { boost::filesystem::path log_path(); +////////////////////////////////////////////////// +// Definition +////////////////////////////////////////////////// + +constexpr Level log_level_from_int32(std::int32_t value) { + switch (value) { + case bts::Diag.ordinal: + return Diag; + case bts::Info.ordinal: + return Info; + case bts::Warn.ordinal: + return Warn; + case bts::Error.ordinal: + return Error; + case bts::Fatal.ordinal: + return Fatal; + case bts::Sys.ordinal: + return Sys; + default: + return NoLog; + } +} + #define LOG(subsystem, level, ...) \ bts::log::_thread_logger.logger->is_loggable(bts::log::subsystem, level) && \ bts::log::_thread_logger.logger->enqueue( \