Skip to content

Commit

Permalink
add separate logging config template file for scripts; make enter_dat…
Browse files Browse the repository at this point in the history
…a.py and worker.py log INFO to stdout by default
  • Loading branch information
bcyphers committed Mar 2, 2018
1 parent d9600fb commit 95f2d32
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 2 deletions.
6 changes: 6 additions & 0 deletions atm/config/templates/log-script.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
log_level_stdout: 'info'
log_level_file: 'info'
log_dir: 'logs'
model_dir: 'models'
metric_dir: 'metrics'
verbose_metrics: False
4 changes: 2 additions & 2 deletions atm/config/templates/log.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
log_level_stdout: 'ERROR'
log_level_file: 'INFO'
log_level_stdout: 'error'
log_level_file: 'info'
log_dir: 'logs'
model_dir: 'models'
metric_dir: 'metrics'
Expand Down
7 changes: 7 additions & 0 deletions scripts/enter_data.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
from __future__ import print_function

import argparse
import os
import warnings

from atm import PROJECT_ROOT
from atm.config import (add_arguments_aws_s3, add_arguments_sql,
add_arguments_datarun, add_arguments_logging,
load_config, initialize_logging)
Expand Down Expand Up @@ -32,6 +34,11 @@

args = parser.parse_args()

# default logging config is different if initialized from the command line
if args.log_config is None:
args.log_config = os.path.join(PROJECT_ROOT,
'config/templates/log-script.yaml')

# create config objects from the config files and/or command line args
sql_conf, run_conf, aws_conf, log_conf = load_config(sql_path=args.sql_config,
run_path=args.run_config,
Expand Down
8 changes: 8 additions & 0 deletions scripts/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@

import argparse
import datetime
import os
import warnings

from atm import PROJECT_ROOT
from atm.config import (add_arguments_aws_s3, add_arguments_logging,
add_arguments_sql, load_config, initialize_logging)
from atm.database import Database
Expand Down Expand Up @@ -33,6 +35,12 @@

# parse arguments and load configuration
args = parser.parse_args()

# default logging config is different if initialized from the command line
if args.log_config is None:
args.log_config = os.path.join(PROJECT_ROOT,
'config/templates/log-script.yaml')

sql_config, _, aws_config, log_config = load_config(**vars(args))
initialize_logging(log_config)

Expand Down

0 comments on commit 95f2d32

Please sign in to comment.