Skip to content
This repository was archived by the owner on Sep 12, 2018. It is now read-only.

Commit 8712fbe

Browse files
committed
Merge pull request #485 from deis/fix-logging-setup
Configure logging before modules that require it
2 parents 1e09d6d + 95056d3 commit 8712fbe

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

docker_registry/app.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,18 @@
1414

1515
from . import toolkit
1616
from .lib import config
17-
from .lib import mirroring
18-
from .server import __version__
1917

20-
app = flask.Flask('docker-registry')
18+
# configure logging prior to subsequent imports which assume
19+
# logging has been configured
2120
cfg = config.load()
2221
logging.basicConfig(format='%(asctime)s %(levelname)s: %(message)s',
2322
level=getattr(logging, cfg.loglevel.upper()))
2423

24+
from .lib import mirroring
25+
from .server import __version__
26+
27+
app = flask.Flask('docker-registry')
28+
2529

2630
@app.route('/_ping')
2731
@app.route('/v1/_ping')

0 commit comments

Comments
 (0)