diff --git a/examples.py b/examples.py index f299235..dca44e0 100644 --- a/examples.py +++ b/examples.py @@ -8,7 +8,7 @@ import_type = import_type_factory.get_attack_import() logging.basicConfig(level=logging.DEBUG, format='[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s') logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) + connection = { "uri": "localhost", diff --git a/stixorm/__init__.py b/stixorm/__init__.py index b7a91b5..6afc854 100644 --- a/stixorm/__init__.py +++ b/stixorm/__init__.py @@ -1,5 +1,4 @@ import logging import os -logging.basicConfig(level=logging.INFO, format='[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s') logger = logging.getLogger(__name__) \ No newline at end of file diff --git a/stixorm/module/authorise.py b/stixorm/module/authorise.py index 04970eb..7abe213 100644 --- a/stixorm/module/authorise.py +++ b/stixorm/module/authorise.py @@ -8,7 +8,7 @@ from stixorm.module.typedb_lib.factories.process_map_factory import ProcessMapFactory logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) + diff --git a/stixorm/module/initialise.py b/stixorm/module/initialise.py index 340f6f8..8ccefcc 100644 --- a/stixorm/module/initialise.py +++ b/stixorm/module/initialise.py @@ -29,7 +29,7 @@ from typedb.driver import TypeDB logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) + attack_raw = "https://raw.githubusercontent.com/mitre-attack/attack-stix-data/master/index.json" diff --git a/stixorm/module/orm/delete_object.py b/stixorm/module/orm/delete_object.py index a6d89bb..f13fa66 100644 --- a/stixorm/module/orm/delete_object.py +++ b/stixorm/module/orm/delete_object.py @@ -12,7 +12,7 @@ from stixorm.module.typedb_lib.factories.auth_factory import get_auth_factory_instance logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) + ############################################################## # 1.) Methods to Delete any Stix Objects ############################################################ diff --git a/stixorm/module/orm/export_object.py b/stixorm/module/orm/export_object.py index 5f6541c..13d7893 100644 --- a/stixorm/module/orm/export_object.py +++ b/stixorm/module/orm/export_object.py @@ -13,7 +13,7 @@ from stixorm.module.typedb_lib.factories.import_type_factory import ImportType logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) + ################################################################################################### diff --git a/stixorm/module/orm/export_utilities.py b/stixorm/module/orm/export_utilities.py index 064bd86..476019a 100644 --- a/stixorm/module/orm/export_utilities.py +++ b/stixorm/module/orm/export_utilities.py @@ -11,7 +11,7 @@ from stixorm.module.typedb_lib.factories.import_type_factory import ImportType logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) + # -------------------------------------------------------------------------------------------------------- diff --git a/stixorm/module/orm/import_objects.py b/stixorm/module/orm/import_objects.py index 8e0f95b..fa09402 100644 --- a/stixorm/module/orm/import_objects.py +++ b/stixorm/module/orm/import_objects.py @@ -12,7 +12,7 @@ from stixorm.module.typedb_lib.factories.auth_factory import get_auth_factory_instance logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) + marking =["marking-definition--613f2e26-407d-48c7-9eca-b8e91df99dc9", diff --git a/stixorm/module/orm/import_utilities.py b/stixorm/module/orm/import_utilities.py index fd0c305..ad6dcca 100644 --- a/stixorm/module/orm/import_utilities.py +++ b/stixorm/module/orm/import_utilities.py @@ -12,7 +12,7 @@ stix_models = get_definition_factory_instance().lookup_definition(DefinitionName.STIX_21) logger = logging.getLogger(__name__) -logger.setLevel(logging.INFO) + # --------------------------------------------------- # 1.5) Sub Object Methods for adding common standard properties diff --git a/stixorm/module/parsing/conversion_decisions.py b/stixorm/module/parsing/conversion_decisions.py index 8a4c7cc..d3ae1d2 100644 --- a/stixorm/module/parsing/conversion_decisions.py +++ b/stixorm/module/parsing/conversion_decisions.py @@ -12,7 +12,7 @@ logger = logging.getLogger(__name__) default_import_type = import_type_factory.get_default_import() -logger.setLevel(logging.INFO) + attack_model = get_definition_factory_instance().lookup_definition(DefinitionName.ATTACK) diff --git a/stixorm/module/parsing/parse_objects.py b/stixorm/module/parsing/parse_objects.py index a354fa4..ee87056 100644 --- a/stixorm/module/parsing/parse_objects.py +++ b/stixorm/module/parsing/parse_objects.py @@ -12,7 +12,7 @@ logger = logging.getLogger(__name__) default_import_type = import_type_factory.get_default_import() -logger.setLevel(logging.INFO) + def parse(data: dict, allow_custom=False, import_type: ImportType=default_import_type): diff --git a/test/oasis/test_run_certification.py b/test/oasis/test_run_certification.py index b25c84e..797f1e5 100644 --- a/test/oasis/test_run_certification.py +++ b/test/oasis/test_run_certification.py @@ -26,7 +26,7 @@ format = '[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s' formatter = logging.Formatter(format) logger = logging.getLogger(__name__) -logger.setLevel(logging.DEBUG) + stdout_handler = logging.StreamHandler(sys.stdout) stdout_handler.setLevel(logging.DEBUG) diff --git a/test/test_methods/oasis_certification.py b/test/test_methods/oasis_certification.py index 807d941..67360de 100644 --- a/test/test_methods/oasis_certification.py +++ b/test/test_methods/oasis_certification.py @@ -23,7 +23,7 @@ format = '[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s' formatter = logging.Formatter(format) logger = logging.getLogger(__name__) -logger.setLevel(logging.DEBUG) + stdout_handler = logging.StreamHandler(sys.stdout) stdout_handler.setLevel(logging.DEBUG)