11 files changed, 27 insertions, 30 deletions
diff --git a/allocbench/allocator.py b/allocbench/allocator.py
index e039a7c..060a845 100644
--- a/allocbench/allocator.py
+++ b/allocbench/allocator.py
@@ -20,7 +20,6 @@ from datetime import datetime
 import fnmatch
 import inspect
 import importlib
-import logging
 import os
 from pathlib import Path
 import shutil
@@ -28,12 +27,12 @@ from subprocess import CalledProcessError
 from typing import List, Optional
 
 from allocbench.artifact import Artifact, ArchiveArtifact, GitArtifact
-from allocbench.util import print_status, run_cmd
+from allocbench.util import print_status, run_cmd, get_logger
 from allocbench.directories import (get_allocbench_build_dir,
                                     get_allocbench_allocator_src_dir,
                                     get_allocbench_allocator_build_dir)
 
-logger = logging.getLogger(__file__)
+logger = get_logger(__file__)
 
 LIBRARY_PATH = ""
 for line in run_cmd(["ldconfig", "-v", "-N"],
diff --git a/allocbench/analyse.py b/allocbench/analyse.py
index 6e7c338..74c8624 100644
--- a/allocbench/analyse.py
+++ b/allocbench/analyse.py
@@ -17,13 +17,12 @@
 """Analyze benchmarks and allocators"""
 
 import importlib
-import logging
 import os
 import traceback
 
-from allocbench.util import find_cmd, print_status
+from allocbench.util import find_cmd, print_status, get_logger
 
-logger = logging.getLogger(__file__)
+logger = get_logger(__file__)
 
 
 def build_analyze_alloc():
diff --git a/allocbench/artifact.py b/allocbench/artifact.py
index a0efd1b..e3126a7 100644
--- a/allocbench/artifact.py
+++ b/allocbench/artifact.py
@@ -22,15 +22,14 @@ Both flavours are version controlled archive with a checksum and git repositorie
 with a specific checkout.
 """
 
-import logging
 from subprocess import CalledProcessError
 
 from allocbench.directories import get_allocbench_base_dir
-from allocbench.util import print_status, run_cmd, sha1sum
+from allocbench.util import print_status, run_cmd, sha1sum, get_logger
 
 ARTIFACT_STORE_DIR = get_allocbench_base_dir() / "cache"
 
-logger = logging.getLogger(__file__)
+logger = get_logger(__file__)
 
 
 class Artifact:  # pylint: disable=too-few-public-methods
diff --git a/allocbench/benchmark.py b/allocbench/benchmark.py
index 0846e42..90d0572 100644
--- a/allocbench/benchmark.py
+++ b/allocbench/benchmark.py
@@ -24,7 +24,6 @@ import csv
 import importlib
 import itertools
 import json
-import logging
 import multiprocessing
 import os
 import subprocess
@@ -40,10 +39,10 @@ from allocbench.directories import (get_allocbench_benchmark_src_dir,
                                     get_allocbench_build_dir)
 import allocbench.facter as facter
 import allocbench.globalvars
-from allocbench.util import print_status
-from allocbench.util import find_cmd, prefix_cmd_with_abspath, run_cmd
+from allocbench.util import (print_status, find_cmd, prefix_cmd_with_abspath,
+                             run_cmd, get_logger)
 
-logger = logging.getLogger(__file__)
+logger = get_logger(__file__)
 
 AVAIL_BENCHMARKS = [
     p.stem for p in get_allocbench_benchmark_src_dir().glob('*.py')
diff --git a/allocbench/benchmarks/mysql.py b/allocbench/benchmarks/mysql.py
index db5351f..3b51080 100644
--- a/allocbench/benchmarks/mysql.py
+++ b/allocbench/benchmarks/mysql.py
@@ -72,7 +72,6 @@ allocators algorithm, host system and workload is needed.
 """
 
 import multiprocessing
-import logging
 import os
 import re
 import shutil
@@ -80,9 +79,9 @@ from subprocess import CalledProcessError
 
 from allocbench.benchmark import Benchmark
 import allocbench.facter as facter
-from allocbench.util import print_status, run_cmd
+from allocbench.util import print_status, run_cmd, get_logger
 
-logger = logging.getLogger(__file__)
+logger = get_logger(__file__)
 
 MYSQL_USER = "root"
 RUN_TIME = 300
diff --git a/allocbench/facter.py b/allocbench/facter.py
index e08e1cd..5181d07 100644
--- a/allocbench/facter.py
+++ b/allocbench/facter.py
@@ -20,16 +20,15 @@ import ctypes
 import datetime
 import errno
 import json
-import logging
 import multiprocessing
 import os
 import platform
 from subprocess import CalledProcessError
 
 from allocbench.directories import get_allocbench_build_dir
-from allocbench.util import run_cmd
+from allocbench.util import run_cmd, get_logger
 
-logger = logging.getLogger(__file__)
+logger = get_logger(__file__)
 
 FACTS = {}
 
diff --git a/allocbench/plots.py b/allocbench/plots.py
index 9735519..80e820b 100644
--- a/allocbench/plots.py
+++ b/allocbench/plots.py
@@ -19,7 +19,6 @@
 import ast
 import copy
 import itertools
-import logging
 import operator
 import os
 import re
@@ -32,8 +31,9 @@ import numpy as np
 import scipy.stats
 
 import allocbench.facter as facter
+from allocbench.util import get_logger
 
-logger = logging.getLogger(__file__)
+logger = get_logger(__file__)
 
 # This is useful when evaluating strings in the plot functions. str(np.NaN) == "nan"
 nan = np.NaN  # pylint: disable=invalid-name
diff --git a/allocbench/util.py b/allocbench/util.py
index cb84fb4..0d84e1a 100644
--- a/allocbench/util.py
+++ b/allocbench/util.py
@@ -39,7 +39,12 @@ def set_verbosity(verbosity: int):
     VERBOSITY = verbosity
 
 
-logger = logging.getLogger(__file__)
+def get_logger(path: str) -> logging.Logger:
+    """Return the logger retrieved by logging.getLogger with the basename of path"""
+    return logging.getLogger(os.path.basename(path))
+
+
+logger = get_logger(__file__)
 
 
 def run_cmd(  # pylint: disable=too-many-arguments
diff --git a/bench.py b/bench.py
index a234544..c559949 100755
--- a/bench.py
+++ b/bench.py
@@ -32,11 +32,11 @@ from allocbench.benchmark import get_benchmark_object
 from allocbench.directories import get_current_result_dir, set_current_result_dir
 import allocbench.facter as facter
 import allocbench.globalvars
-from allocbench.util import run_cmd, print_status, print_license_and_exit
+from allocbench.util import run_cmd, print_status, print_license_and_exit, get_logger
 
 from summarize import summarize
 
-logger = logging.getLogger(__file__)
+logger = get_logger(__file__)
 
 
 def epilog():
diff --git a/scripts/paper_plots.py b/scripts/paper_plots.py
index d34141d..bbbb4ae 100755
--- a/scripts/paper_plots.py
+++ b/scripts/paper_plots.py
@@ -19,7 +19,6 @@
 """Create pgfplots used in our paper"""
 
 import argparse
-import logging
 import os
 import sys
 
@@ -33,10 +32,10 @@ from allocbench.benchmark import get_benchmark_object
 from allocbench.directories import get_current_result_dir, set_current_result_dir
 import allocbench.facter as facter
 import allocbench.plots as plt
-from allocbench.util import print_status, set_verbosity, print_license_and_exit
+from allocbench.util import print_status, set_verbosity, print_license_and_exit, get_logger
 # pylint: enable=wrong-import-position
 
-logger = logging.getLogger(__file__)
+logger = get_logger(__file__)
 
 ALLOCATOR_NAMES = [a.name for a in paper_allocators]
 SURVEY_ALLOCATORS = [
diff --git a/summarize.py b/summarize.py
index df5c464..545d06c 100755
--- a/summarize.py
+++ b/summarize.py
@@ -19,7 +19,6 @@
 """Summarize the results of an allocbench run"""
 
 import argparse
-import logging
 import os
 import sys
 
@@ -28,9 +27,9 @@ import allocbench.facter as facter
 import allocbench.globalvars
 import allocbench.benchmark
 import allocbench.util
-from allocbench.util import print_status, set_verbosity, print_license_and_exit
+from allocbench.util import print_status, set_verbosity, print_license_and_exit, get_logger
 
-logger = logging.getLogger(__file__)
+logger = get_logger(__file__)
 
 
 def specific_summary(bench, sum_dir, allocators):