diff --git a/manticore/__main__.py b/manticore/__main__.py index 5b80cec..c881b3c 100644 --- a/manticore/__main__.py +++ b/manticore/__main__.py @@ -133,7 +133,7 @@ def main(): verbosity = {False:logging.INFO, True:logging.DEBUG}[args.verbose] ctxfilter = ContextFilter() - for loggername in ['VISITOR', 'EXECUTOR', 'CPU', 'SMT', 'MEMORY', 'MAIN', 'LINUX', 'DECREE', 'WINDOWS', 'QNX', 'LIBC']: + for loggername in ['VISITOR', 'EXECUTOR', 'CPU', 'SMT', 'MEMORY', 'MAIN', 'MODEL']: logging.getLogger(loggername).addFilter(ctxfilter) logging.getLogger(loggername).setLevel(verbosity) logging.getLogger(loggername).setState = types.MethodType(loggerSetState, logging.getLogger(loggername)) diff --git a/manticore/models/decree.py b/manticore/models/decree.py index 7937b36..3b2cdd8 100644 --- a/manticore/models/decree.py +++ b/manticore/models/decree.py @@ -7,7 +7,7 @@ from ..core.cpu.abstractcpu import Interruption, Syscall, ConcretizeRegister from ..core.memory import SMemory32 from ..core.smtlib import * from ..core.executor import SyscallNotImplemented, ProcessExit, Deadlock, RestartSyscall -logger = logging.getLogger("DECREE") +logger = logging.getLogger("MODEL") from ..binary import CGCElf from ..binary import CGCGrr from contextlib import closing diff --git a/manticore/models/libc.py b/manticore/models/libc.py index 7f8b19b..4eca98d 100644 --- a/manticore/models/libc.py +++ b/manticore/models/libc.py @@ -10,7 +10,7 @@ from ..core.cpu.abstractcpu import Interruption, Syscall, \ from ..core.memory import MemoryException from ..core.executor import ForkState -logger = logging.getLogger("LIBC") +logger = logging.getLogger("MODEL") def _memset_range(cpu, dst, value, rng): diff --git a/manticore/models/linux.py b/manticore/models/linux.py index ca0b1dc..d3e26b0 100644 --- a/manticore/models/linux.py +++ b/manticore/models/linux.py @@ -13,7 +13,7 @@ import logging import random from ..core.cpu.arm import * from ..core.executor import SyscallNotImplemented, ProcessExit -logger = logging.getLogger("LINUX") +logger = logging.getLogger("MODEL") class RestartSyscall(Exception): pass diff --git a/manticore/models/windows.py b/manticore/models/windows.py index 6f30901..595496c 100644 --- a/manticore/models/windows.py +++ b/manticore/models/windows.py @@ -16,7 +16,7 @@ import StringIO import logging import random from windows_syscalls import syscalls_num -logger = logging.getLogger("WINDOWS") +logger = logging.getLogger("MODEL") class ProcessExit(Exception): def __init__(self, code):