Merge branch '2.5.x-installer' into saas-installer-albert
Conflicts: python_apps/pypo/pypo/pypofile.py
This commit is contained in:
commit
6ca0e340a4
13 changed files with 42 additions and 132 deletions
|
@ -18,12 +18,6 @@ from std_err_override import LogWriter
|
|||
|
||||
CONFIG_PATH = '/etc/airtime/airtime.conf'
|
||||
|
||||
# configure logging
|
||||
logging_cfg = "/etc/airtime/pypo_logging.cfg"
|
||||
logging.config.fileConfig(logging_cfg)
|
||||
logger = logging.getLogger()
|
||||
LogWriter.override_std_err(logger)
|
||||
|
||||
#need to wait for Python 2.7 for this..
|
||||
#logging.captureWarnings(True)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue