Add WSGI changes to reporter

Author: wido

reporter/requirements.txt

@@ -0,0 +1,2 @@
+flask
+elasticsearch

reporter/usage-report-collector.py

@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from flask import abort, Flask, request, Response
+from flask import abort, Flask, request
 from elasticsearch import Elasticsearch
 import json
 import time
@@ -30,24 +30,33 @@ def generate_app(config=None):
     @app.route('/report/<unique_id>', methods=['POST'])
     def report(unique_id):
         # We expect JSON data, so if the Content-Type doesn't match JSON data we throw an error
-        if 'Content-Type' in request.headers:
-            if request.headers['Content-Type'] != 'application/json':
-                abort(417, "No or incorrect Content-Type header was supplied")
+        if request.headers.get('Content-Type') != 'application/json':
+            abort(417, "No or incorrect Content-Type header was supplied")
+
+        try:
+            payload = json.loads(request.data)
+        except json.JSONDecodeError:
+            abort(400, "Request body is not valid JSON")
 
         index = "cloudstack-%s" % time.strftime("%Y.%m.%d", time.gmtime())
         timestamp = time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime())
 
         es = Elasticsearch()
-        es.indices.create(index=index, ignore=400)
 
-        report = json.loads(request.data)
-        report["unique_id"] = unique_id
-        report["timestamp"] = timestamp
+        try:
+            es.indices.create(index=index)
+        except Exception:
+            pass  # Index already exists
+
+        payload["unique_id"] = unique_id
+        payload["timestamp"] = timestamp
 
-        es.index(index=index, doc_type="usage-report", body=json.dumps(report), timestamp=timestamp, refresh=True)
+        try:
+            es.index(index=index, body=json.dumps(payload), refresh=True)
+        except Exception as e:
+            abort(500, "Failed to store report: %s" % str(e))
 
-        response = {}
-        return json_response(response)
+        return json_response({})
 
     return app
 

reporter/wsgi.py

@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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
+#
+#   http://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.
+
+# WSGI entry point for mod_wsgi, gunicorn, uWSGI, etc.
+# The main application file uses a hyphenated name which cannot be imported
+# directly, so this shim loads it via importlib.
+#
+# mod_wsgi (Apache):
+#   WSGIScriptAlias /report /path/to/reporter/wsgi.py
+#
+# gunicorn:
+#   gunicorn wsgi:application
+#
+# uWSGI:
+#   uwsgi --wsgi-file wsgi.py --callable application
+
+import importlib.util
+import os
+
+_spec = importlib.util.spec_from_file_location(
+    "usage_report_collector",
+    os.path.join(os.path.dirname(os.path.abspath(__file__)), "usage-report-collector.py")
+)
+_mod = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_mod)
+
+application = _mod.app