From 766746a4c82730f266e2ddd0dcb84eb4a09d56ca Mon Sep 17 00:00:00 2001 From: Brian Potchik Date: Wed, 16 Sep 2020 15:26:47 -0400 Subject: Add setting to control logging in headless. --- python/__init__.py | 10 +++------- python/examples/bin_info.py | 3 +-- 2 files changed, 4 insertions(+), 9 deletions(-) (limited to 'python') diff --git a/python/__init__.py b/python/__init__.py index d26f5a73..f4a91250 100644 --- a/python/__init__.py +++ b/python/__init__.py @@ -164,8 +164,9 @@ def _init_plugins(): global _plugin_init if not _plugin_init: result = core.BNInitCorePlugins() - if result is True and not core_ui_enabled() and sys.stderr.isatty(): - log_to_stderr(LogLevel.InfoLog) + min_level = Settings().get_string("python.log.minLevel") + if result and min_level in LogLevel.__members__ and not core_ui_enabled() and sys.stderr.isatty(): + log_to_stderr(LogLevel[min_level]) if not os.environ.get('BN_DISABLE_USER_PLUGINS'): core.BNInitUserPlugins() core.BNInitRepoPlugins() @@ -177,11 +178,6 @@ def _init_plugins(): _destruct_callbacks = _DestructionCallbackHandler() -def disable_logging(): - '''Disable logging in headless mode. By default, logging is enabled in headless mode.''' - _init_plugins() - close_logs() - def bundled_plugin_path(): """ ``bundled_plugin_path`` returns a string containing the current plugin path inside the `install path `_ diff --git a/python/examples/bin_info.py b/python/examples/bin_info.py index ca270493..87a0e707 100644 --- a/python/examples/bin_info.py +++ b/python/examples/bin_info.py @@ -26,7 +26,7 @@ import binaryninja.log as log from binaryninja.binaryview import BinaryViewType import binaryninja.interaction as interaction from binaryninja.plugin import PluginCommand -from binaryninja import disable_logging +from binaryninja import Settings # 2-3 compatibility from binaryninja import range @@ -77,7 +77,6 @@ def display_bininfo(bv): if __name__ == "__main__": - disable_logging() print(get_bininfo(None)) else: PluginCommand.register("Binary Info", "Display basic info about the binary", display_bininfo) -- cgit v1.3.1