Updated to latest code without redis

Author: rofrano

Dockerfile

@@ -16,6 +16,7 @@ RUN useradd -m -r service && \
     chown -R service:service /app
 USER service
 
-# Run the service on port 8080
-EXPOSE 8080
-CMD ["gunicorn", "service:app", "--bind", "0.0.0.0:8080"]
+# Run the service on port 8000
+ENV PORT 8000
+EXPOSE $PORT
+CMD ["gunicorn", "service:app", "--bind", "0.0.0.0:8000"]

requirements.txt

@@ -4,7 +4,6 @@ Werkzeug==2.1.2
 # Runtime dependencies
 Flask==2.1.2
 python-dotenv==0.20.0
-redis==3.5.3
 
 # Runtime tools
 gunicorn==20.1.0
@@ -18,7 +17,6 @@ black==22.3.0
 # Testing dependencies
 nose==1.3.7
 pinocchio==0.4.3
-factory-boy==2.12.0
 coverage==6.3.2
 codecov==2.1.12
 

service/__init__.py

@@ -1,47 +1,16 @@
-# Copyright 2016, 2021 John J. Rofrano. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
 """
-Package: service
-Package for the application models and service routes
-This module creates and configures the Flask app and sets up the logging
-and SQL database
+Service Package
 """
 from flask import Flask
 
-# Create Flask application
 app = Flask(__name__)
-# app.config.from_object("config")
 
-# Import the routes AFTER the Flask app is created
-# pylint: disable=wrong-import-position, cyclic-import
-from service import routes
-from service.utils import log_handler
+# This must be imported after the Flask app is created
+from service import routes               # pylint: disable=wrong-import-position,cyclic-import
+from service.common import log_handlers  # pylint: disable=wrong-import-position
 
-# Set up logging for production
-print(f"Setting up logging for {__name__}...")
-log_handler.initialize_logging()
+log_handlers.init_logging(app, "gunicorn.error")
 
 app.logger.info(70 * "*")
-app.logger.info("  H I T   C O U N T E R   S E R V I C E  ".center(70, "*"))
+app.logger.info("  S E R V I C E   R U N N I N G  ".center(70, "*"))
 app.logger.info(70 * "*")
-
-# try:
-#     models.init_db(app)  # make our sqlalchemy tables
-# except Exception as error:
-#     app.logger.critical("%s: Cannot continue", error)
-#     # gunicorn requires exit code 4 to stop spawning workers when they die
-#     sys.exit(4)
-
-app.logger.info("Service initialized!")

service/utils/error_handlers.py renamed to service/common/error_handlers.py

@@ -1,4 +1,5 @@
-# Copyright 2016, 2021 John J. Rofrano. All Rights Reserved.
+######################################################################
+# Copyright 2016, 2022 John J. Rofrano. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -11,6 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+######################################################################
 
 """
 Module: error_handlers
@@ -23,6 +25,19 @@
 ######################################################################
 # Error Handlers
 ######################################################################
+@app.errorhandler(status.HTTP_400_BAD_REQUEST)
+def bad_request(error):
+    """Handles bad requests with 400_BAD_REQUEST"""
+    message = str(error)
+    app.logger.warning(message)
+    return (
+        jsonify(
+            status=status.HTTP_400_BAD_REQUEST, error="Bad Request", message=message
+        ),
+        status.HTTP_400_BAD_REQUEST,
+    )
+
+
 @app.errorhandler(status.HTTP_404_NOT_FOUND)
 def not_found(error):
     """Handles resources not found with 404_NOT_FOUND"""
@@ -49,31 +64,46 @@ def method_not_supported(error):
     )
 
 
-@app.errorhandler(status.HTTP_500_INTERNAL_SERVER_ERROR)
-def internal_server_error(error):
-    """Handles unexpected server error with 500_SERVER_ERROR"""
+@app.errorhandler(status.HTTP_409_CONFLICT)
+def resource_conflict(error):
+    """Handles resource conflicts with HTTP_409_CONFLICT"""
     message = str(error)
-    app.logger.error(message)
+    app.logger.warning(message)
     return (
         jsonify(
-            status=status.HTTP_500_INTERNAL_SERVER_ERROR,
-            error="Internal Server Error",
+            status=status.HTTP_409_CONFLICT,
+            error="Conflict",
             message=message,
         ),
-        status.HTTP_500_INTERNAL_SERVER_ERROR,
+        status.HTTP_409_CONFLICT,
     )
 
 
-@app.errorhandler(status.HTTP_503_SERVICE_UNAVAILABLE)
-def service_unavailable(error):
-    """Handles service not available HTTP methods with HTTP_503_SERVICE_UNAVAILABLE"""
+@app.errorhandler(status.HTTP_415_UNSUPPORTED_MEDIA_TYPE)
+def mediatype_not_supported(error):
+    """Handles unsupported media requests with 415_UNSUPPORTED_MEDIA_TYPE"""
     message = str(error)
     app.logger.warning(message)
     return (
         jsonify(
-            status=status.HTTP_503_SERVICE_UNAVAILABLE,
-            error="Service not available",
+            status=status.HTTP_415_UNSUPPORTED_MEDIA_TYPE,
+            error="Unsupported media type",
+            message=message,
+        ),
+        status.HTTP_415_UNSUPPORTED_MEDIA_TYPE,
+    )
+
+
+@app.errorhandler(status.HTTP_500_INTERNAL_SERVER_ERROR)
+def internal_server_error(error):
+    """Handles unexpected server error with 500_SERVER_ERROR"""
+    message = str(error)
+    app.logger.error(message)
+    return (
+        jsonify(
+            status=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            error="Internal Server Error",
             message=message,
         ),
-        status.HTTP_503_SERVICE_UNAVAILABLE,
+        status.HTTP_500_INTERNAL_SERVER_ERROR,
     )

service/utils/log_handler.py renamed to service/common/log_handlers.py

@@ -1,5 +1,5 @@
 ######################################################################
-# Copyright 2016, 2021 John J. Rofrano. All Rights Reserved.
+# Copyright 2016, 2022 John J. Rofrano. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,24 +15,20 @@
 ######################################################################
 
 """
-Log Handler module
-"""
+Log Handlers
 
+This module contains utility functions to set up logging
+consistently
+"""
 import logging
-from service import app
 
 
-############################################################
-# set up logging for Flask applications
-############################################################
-def initialize_logging(log_level=None):
-    gunicorn_logger = logging.getLogger("gunicorn.error")
-    app.logger.handlers = gunicorn_logger.handlers
-    if log_level:
-        app.logger.setLevel(log_level)
-    else:
-        app.logger.setLevel(gunicorn_logger.level)
+def init_logging(app, logger_name: str):
+    """Set up logging for production"""
     app.logger.propagate = False
+    gunicorn_logger = logging.getLogger(logger_name)
+    app.logger.handlers = gunicorn_logger.handlers
+    app.logger.setLevel(gunicorn_logger.level)
     # Make all log formats consistent
     formatter = logging.Formatter(
         "[%(asctime)s] [%(levelname)s] [%(module)s] %(message)s", "%Y-%m-%d %H:%M:%S %z"

service/utils/status.py renamed to service/common/status.py

@@ -1,21 +1,3 @@
-# coding: utf8
-
-######################################################################
-# Copyright 2016, 2021 John J. Rofrano. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-######################################################################
-
 """
 Descriptive HTTP status codes, for code readability.
 See RFC 2616 and RFC 6585.