Start using logging

Instead of using simple print statements, lets start use logging. As a
side effect, some modules where loading plugins when the module was
imported, printing (thus logging) things before the logger was set up.
This change also fixes this, loading things after logging is properly
configured.

Author: alvarolopez

deepaas/api/__init__.py

@@ -16,24 +16,37 @@
 
 import flask
 import flask_restplus
+from oslo_log import log as logging
 
 import deepaas
 from deepaas.api import v1
 from deepaas import model
 
-app = flask.Flask(__name__)
-app.config.SWAGGER_UI_DOC_EXPANSION = 'list'
+LOG = logging.getLogger(__name__)
 
-api = flask_restplus.Api(
-    app,
-    version=deepaas.__version__,
-    title='DEEP as a Service API endpoint',
-    description='DEEP as a Service (DEEPaaS) API endpoint.',
-)
-
-api.add_namespace(v1.api, path="/models")
+APP = None
 
 
 def get_app():
-    print("Loaded models: %s" % model.MODELS.keys())
-    return app
+    global APP
+
+    if APP:
+        return APP
+
+    model.register_models()
+
+    APP = flask.Flask(__name__)
+    APP.config.SWAGGER_UI_DOC_EXPANSION = 'list'
+
+    api = flask_restplus.Api(
+        APP,
+        version=deepaas.__version__,
+        title='DEEP as a Service API endpoint',
+        description='DEEP as a Service (DEEPaaS) API endpoint.',
+    )
+
+    api.add_namespace(v1.api, path="/models")
+
+    LOG.info("Serving loaded models: %s", model.MODELS.keys())
+
+    return APP

deepaas/cmd/run.py

@@ -18,7 +18,9 @@
 import sys
 
 from oslo_config import cfg
+from oslo_log import log as logging
 
+import deepaas
 from deepaas import api
 from deepaas import config
 
@@ -47,11 +49,16 @@
 
 def main():
     config.parse_args(sys.argv)
+    logging.setup(CONF, "deepaas")
+    log = logging.getLogger(__name__)
+
+    log.info("Starting DEEPaaS version %s", deepaas.__version__)
+
     app = api.get_app()
     app.run(
-        debug=True,
         host=CONF.listen_ip,
         port=CONF.listen_port,
+        debug=CONF.debug,
     )
 
 

deepaas/config.py

@@ -14,12 +14,23 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import logging
+import warnings
+
 from oslo_config import cfg
+from oslo_log import log
 
 import deepaas
 
+logging.captureWarnings(True)
+warnings.simplefilter("default", DeprecationWarning)
+
 
 def parse_args(argv, default_config_files=None):
+    log.register_options(cfg.CONF)
+
+    log.set_defaults(default_log_levels=log.get_default_log_levels())
+
     cfg.CONF(argv[1:],
              project='deepaas',
              version=deepaas.__version__,

deepaas/model.py

@@ -14,10 +14,37 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+from oslo_log import log
 import werkzeug.exceptions as exceptions
 
 from deepaas import loading
 
+LOG = log.getLogger(__name__)
+
+# Model registry
+MODELS = {}
+MODELS_LOADED = False
+
+
+def register_models():
+    global MODELS
+    global MODELS_LOADED
+
+    if MODELS_LOADED:
+        return
+
+    MODELS = {}
+    try:
+        for name, model in loading.get_available_models().items():
+            MODELS[name] = BaseModel(name, model)
+    except Exception as e:
+        LOG.warning("Error loading models %s", e)
+
+    if not MODELS:
+        LOG.info("No models found, loading test model")
+        MODELS["deepaas-test"] = TestModel("deepaas-test")
+    MODELS_LOADED = True
+
 
 class BaseModel(object):
     def __init__(self, name, model):
@@ -74,19 +101,3 @@ def get_metadata(self):
             "version": "0.0.1",
         }
         return d
-
-
-def populate_models():
-    models = {}
-    try:
-        for name, model in loading.get_available_models().items():
-            models[name] = BaseModel(name, model)
-    except Exception as e:
-        # TODO(aloga): use logging, not prints
-        print("Cannot load any models: %s" % e)
-    if not models:
-        print("Loading test model")
-        models["deepaas-test"] = TestModel("deepaas-test")
-    return models
-
-MODELS = populate_models()

deepaas/tests/test_api.py

@@ -30,7 +30,7 @@
 
 
 class TestApi(base.TestCase):
-    @mock.patch('deepaas.api.app')
+    @mock.patch('deepaas.api.APP')
     def test_get_app(self, mock_app):
         self.assertEqual(mock_app, api.get_app())
 
@@ -62,6 +62,8 @@ def setUp(self):
         api = flask_restplus.Api(app, doc=False)
         api.add_namespace(v1.api)
 
+        deepaas.model.register_models()
+
         self.app = app.test_client()
         self.assertEqual(app.debug, True)
 

requirements.txt

@@ -3,6 +3,7 @@
 # process, which may cause wedges in the gate later.
 pbr>=1.8
 
+oslo.log>=1.8.0 # Apache-2.0
 oslo.config>=2.3.0 # Apache-2.0
 
 enum34