Skip to content

Commit 1127973

Browse files
committed
Use centralized logging setup
1 parent 9449c52 commit 1127973

File tree

11 files changed

+15
-73
lines changed

11 files changed

+15
-73
lines changed
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import logging
2+
3+
# Set up console logging
4+
logging_console_handler = logging.StreamHandler()
5+
logging_formatter = logging.Formatter(
6+
"%(asctime)s.%(msecs)03d %(levelname)s [%(module)s] %(message)s", datefmt="%Y-%m-%dT%H:%M:%S"
7+
)
8+
logging_console_handler.setFormatter(logging_formatter)
9+
# Set up root logger
10+
root_logger = logging.getLogger()
11+
root_logger.setLevel(logging.INFO)
12+
root_logger.addHandler(logging_console_handler)

components/clp-package-utils/clp_package_utils/scripts/compress.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,8 @@
1818
validate_and_load_db_credentials_file,
1919
)
2020

21-
# Setup logging
2221
# Create logger
2322
logger = logging.getLogger(__file__)
24-
logger.setLevel(logging.INFO)
25-
# Setup console logging
26-
logging_console_handler = logging.StreamHandler()
27-
logging_formatter = logging.Formatter("%(asctime)s [%(levelname)s] [%(name)s] %(message)s")
28-
logging_console_handler.setFormatter(logging_formatter)
29-
logger.addHandler(logging_console_handler)
3023

3124

3225
def main(argv):

components/clp-package-utils/clp_package_utils/scripts/decompress.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,8 @@
2424
validate_path_could_be_dir,
2525
)
2626

27-
# Setup logging
2827
# Create logger
29-
logger = logging.getLogger("clp")
30-
logger.setLevel(logging.DEBUG)
31-
# Setup console logging
32-
logging_console_handler = logging.StreamHandler()
33-
logging_formatter = logging.Formatter("%(asctime)s [%(levelname)s] [%(name)s] %(message)s")
34-
logging_console_handler.setFormatter(logging_formatter)
35-
logger.addHandler(logging_console_handler)
28+
logger = logging.getLogger(__file__)
3629

3730

3831
def validate_and_load_config(

components/clp-package-utils/clp_package_utils/scripts/del_archives.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,8 @@
1616
validate_and_load_db_credentials_file,
1717
)
1818

19-
# Setup logging
2019
# Create logger
2120
logger = logging.getLogger(__file__)
22-
logger.setLevel(logging.INFO)
23-
# Setup console logging
24-
logging_console_handler = logging.StreamHandler()
25-
logging_formatter = logging.Formatter("%(asctime)s [%(levelname)s] [%(name)s] %(message)s")
26-
logging_console_handler.setFormatter(logging_formatter)
27-
logger.addHandler(logging_console_handler)
2821

2922

3023
def main(argv):

components/clp-package-utils/clp_package_utils/scripts/native/compress.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,8 @@
2323
load_config_file,
2424
)
2525

26-
# Setup logging
2726
# Create logger
2827
logger = logging.getLogger(__file__)
29-
logger.setLevel(logging.INFO)
30-
# Setup console logging
31-
logging_console_handler = logging.StreamHandler()
32-
logging_formatter = logging.Formatter("%(asctime)s [%(levelname)s] [%(name)s] %(message)s")
33-
logging_console_handler.setFormatter(logging_formatter)
34-
logger.addHandler(logging_console_handler)
3528

3629

3730
def print_compression_job_status(job_row, current_time):

components/clp-package-utils/clp_package_utils/scripts/native/decompress.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,8 @@
2727
wait_for_query_job,
2828
)
2929

30-
# Setup logging
3130
# Create logger
3231
logger = logging.getLogger(__file__)
33-
logger.setLevel(logging.INFO)
34-
# Setup console logging
35-
logging_console_handler = logging.StreamHandler()
36-
logging_formatter = logging.Formatter("%(asctime)s [%(levelname)s] [%(name)s] %(message)s")
37-
logging_console_handler.setFormatter(logging_formatter)
38-
logger.addHandler(logging_console_handler)
3932

4033

4134
def get_orig_file_id(db_config: Database, path: str) -> Optional[str]:

components/clp-package-utils/clp_package_utils/scripts/native/del_archives.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,8 @@
1515
load_config_file,
1616
)
1717

18-
# Setup logging
1918
# Create logger
2019
logger = logging.getLogger(__file__)
21-
logger.setLevel(logging.INFO)
22-
# Setup console logging
23-
logging_console_handler = logging.StreamHandler()
24-
logging_formatter = logging.Formatter("%(asctime)s [%(levelname)s] [%(name)s] %(message)s")
25-
logging_console_handler.setFormatter(logging_formatter)
26-
logger.addHandler(logging_console_handler)
2720

2821

2922
def main(argv):

components/clp-package-utils/clp_package_utils/scripts/native/search.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,8 @@
2626
wait_for_query_job,
2727
)
2828

29-
# Setup logging
3029
# Create logger
3130
logger = logging.getLogger(__file__)
32-
logger.setLevel(logging.INFO)
33-
# Setup console logging
34-
logging_console_handler = logging.StreamHandler()
35-
logging_formatter = logging.Formatter("%(asctime)s [%(levelname)s] [%(name)s] %(message)s")
36-
logging_console_handler.setFormatter(logging_formatter)
37-
logger.addHandler(logging_console_handler)
3831

3932

4033
def create_and_monitor_job_in_db(

components/clp-package-utils/clp_package_utils/scripts/search.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,8 @@
2020
validate_and_load_db_credentials_file,
2121
)
2222

23-
# Setup logging
2423
# Create logger
2524
logger = logging.getLogger(__file__)
26-
logger.setLevel(logging.INFO)
27-
# Setup console logging
28-
logging_console_handler = logging.StreamHandler()
29-
logging_formatter = logging.Formatter("%(asctime)s [%(levelname)s] [%(name)s] %(message)s")
30-
logging_console_handler.setFormatter(logging_formatter)
31-
logger.addHandler(logging_console_handler)
3225

3326

3427
def main(argv):

components/clp-package-utils/clp_package_utils/scripts/start_clp.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,8 @@
5959
validate_worker_config,
6060
)
6161

62-
# Setup logging
6362
# Create logger
64-
logger = logging.getLogger("clp")
65-
logger.setLevel(logging.INFO)
66-
# Setup console logging
67-
logging_console_handler = logging.StreamHandler()
68-
logging_formatter = logging.Formatter("%(asctime)s [%(levelname)s] [%(name)s] %(message)s")
69-
logging_console_handler.setFormatter(logging_formatter)
70-
logger.addHandler(logging_console_handler)
63+
logger = logging.getLogger(__file__)
7164

7265

7366
def container_exists(container_name):

0 commit comments

Comments
 (0)