Merge pull request #84 from flask-dashboard/group_by

resolved bug

flask_monitoringdashboard/database/function_calls.py

@@ -27,8 +27,11 @@ def add_function_call(time, endpoint, ip):
     """ Add a measurement to the database. """
     with session_scope() as db_session:
         group_by = None
-        if config.get_group_by:
-            group_by = config.get_group_by()
+        try:
+            if config.get_group_by:
+                group_by = config.get_group_by()
+        except Exception as e:
+            print('Can\'t execute group_by function: {}'.format(e))
         call = FunctionCall(endpoint=endpoint, execution_time=time, version=config.version,
                             time=datetime.datetime.now(), group_by=str(group_by), ip=ip)
         db_session.add(call)

flask_monitoringdashboard/measurement.py

@@ -70,8 +70,8 @@ def wrapper(*args, **kwargs):
         add_function_call(time=t, endpoint=endpoint, ip=request.environ['REMOTE_ADDR'])
 
         # outlier detection
-        endpoint_count[endpoint] += 1
-        endpoint_sum[endpoint] += t
+        endpoint_count[endpoint] = endpoint_count.get(endpoint, 0) + 1
+        endpoint_sum[endpoint] = endpoint_sum.get(endpoint, 0) + t
 
         if stack_info:
             add_outlier(endpoint, t, stack_info, request)

setup.py

@@ -19,7 +19,7 @@ def desc():
 
 setuptools.setup(
     name="Flask-MonitoringDashboard",
-    version='1.11.3',
+    version='1.11.5',
     packages=setuptools.find_packages(),
     include_package_data=True,
     platforms='Any',