Skip to content

Commit 49bfe4a

Browse files
author
Vladimir Kotal
committed
make sure the logger is inherited
1 parent 4c2686c commit 49bfe4a

File tree

9 files changed

+20
-16
lines changed

9 files changed

+20
-16
lines changed

opengrok-tools/src/main/python/opengrok_tools/deploy.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import tempfile
2929
from zipfile import ZipFile
3030
from shutil import copyfile
31-
from .utils.log import get_console_logger
31+
from .utils.log import get_console_logger, get_class_basename
3232

3333
"""
3434
deploy war file
@@ -112,7 +112,7 @@ def main():
112112
loglevel = logging.INFO
113113
if args.debug:
114114
loglevel = logging.DEBUG
115-
logger = get_console_logger(__name__, loglevel)
115+
logger = get_console_logger(get_class_basename(), loglevel)
116116

117117
deploy_war(logger, args.source_war[0], args.target_war[0], args.config)
118118

opengrok-tools/src/main/python/opengrok_tools/groups.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import sys
2727

2828
from .utils.java import Java, get_javaparser
29-
from .utils.log import get_console_logger
29+
from .utils.log import get_console_logger, get_class_basename
3030

3131

3232
"""
@@ -44,7 +44,7 @@ def main():
4444
loglevel = logging.INFO
4545
if args.debug:
4646
loglevel = logging.DEBUG
47-
logger = get_console_logger(__name__, loglevel)
47+
logger = get_console_logger(get_class_basename(), loglevel)
4848

4949
cmd = Java(args.options, classpath=args.jar, java=args.java,
5050
java_opts=args.java_opts, redirect_stderr=False,

opengrok-tools/src/main/python/opengrok_tools/indexer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
from .utils.indexer import FindCtags, Indexer
3131
from .utils.java import get_javaparser
32-
from .utils.log import get_console_logger
32+
from .utils.log import get_console_logger, get_class_basename
3333

3434
"""
3535
opengrok.jar wrapper
@@ -49,7 +49,7 @@ def main():
4949
loglevel = logging.INFO
5050
if args.debug:
5151
loglevel = logging.DEBUG
52-
logger = get_console_logger(__name__, loglevel)
52+
logger = get_console_logger(get_class_basename(), loglevel)
5353

5454
#
5555
# Since it is not possible to tell what kind of action is performed,

opengrok-tools/src/main/python/opengrok_tools/java.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import sys
2828

2929
from .utils.java import Java, get_javaparser
30-
from .utils.log import get_console_logger
30+
from .utils.log import get_console_logger, get_class_basename
3131

3232

3333
def main():
@@ -41,7 +41,7 @@ def main():
4141
loglevel = logging.INFO
4242
if args.debug:
4343
loglevel = logging.DEBUG
44-
logger = get_console_logger(__name__, loglevel)
44+
logger = get_console_logger(get_class_basename(), loglevel)
4545

4646
java = Java(args.options, logger=logger, java=args.java,
4747
jar=args.jar, java_opts=args.java_opts,

opengrok-tools/src/main/python/opengrok_tools/mirror.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from filelock import Timeout, FileLock
4040

4141
from .utils.hook import run_hook
42-
from .utils.log import get_console_logger
42+
from .utils.log import get_console_logger, get_class_basename
4343
from .utils.opengrok import get_repos, get_config_value, get_repo_type
4444
from .utils.readconfig import read_config
4545
from .utils.repofactory import get_repository
@@ -138,7 +138,7 @@ def main():
138138
loglevel = logging.INFO
139139
if args.debug:
140140
loglevel = logging.DEBUG
141-
logger = get_console_logger(__name__, loglevel)
141+
logger = get_console_logger(get_class_basename(), loglevel)
142142

143143
if args.config:
144144
config = read_config(logger, args.config)

opengrok-tools/src/main/python/opengrok_tools/projadm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
from filelock import Timeout, FileLock
3838

3939
from .utils.command import Command
40-
from .utils.log import get_console_logger
40+
from .utils.log import get_console_logger, get_class_basename
4141
from .utils.opengrok import get_configuration, set_configuration, \
4242
add_project, delete_project, get_config_value
4343
from .utils.utils import get_command, is_web_uri
@@ -251,7 +251,7 @@ def main():
251251
loglevel = logging.INFO
252252
if args.debug:
253253
loglevel = logging.DEBUG
254-
logger = get_console_logger(__name__, loglevel)
254+
logger = get_console_logger(get_class_basename(), loglevel)
255255

256256
if args.nosourcedelete and not args.delete:
257257
logger.error("The no source delete option is only valid for delete")

opengrok-tools/src/main/python/opengrok_tools/reindex_project.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
from .utils.indexer import Indexer
3232
from .utils.java import get_javaparser
33-
from .utils.log import get_console_logger
33+
from .utils.log import get_console_logger, get_class_basename
3434
from .utils.opengrok import get_configuration
3535

3636
"""
@@ -90,7 +90,7 @@ def main():
9090
loglevel = logging.INFO
9191
if args.debug:
9292
loglevel = logging.DEBUG
93-
logger = get_console_logger(__name__, loglevel)
93+
logger = get_console_logger(get_class_basename(), loglevel)
9494

9595
# Make sure the log directory exists.
9696
if not os.path.isdir(args.directory):

opengrok-tools/src/main/python/opengrok_tools/sync.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
from .utils.opengrok import list_indexed_projects, get_config_value
4545
from .utils.readconfig import read_config
4646
from .utils.utils import is_web_uri
47-
from .utils.log import get_console_logger
47+
from .utils.log import get_console_logger, get_class_basename
4848

4949
major_version = sys.version_info[0]
5050
if (major_version < 3):
@@ -95,7 +95,7 @@ def main():
9595
loglevel = logging.INFO
9696
if args.debug:
9797
loglevel = logging.DEBUG
98-
logger = get_console_logger(__name__, loglevel)
98+
logger = get_console_logger(get_class_basename(), loglevel)
9999

100100
uri = args.uri
101101
if not is_web_uri(uri):

opengrok-tools/src/main/python/opengrok_tools/utils/log.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
import sys
2626

2727

28+
def get_class_basename():
29+
return __name__.split('.')[0]
30+
31+
2832
def get_console_logger(name, level=logging.INFO, format='%(message)s'):
2933
"""
3034
Get logger that logs logging.ERROR and higher to stderr, the rest

0 commit comments

Comments
 (0)