[Fixes GeoNode#7948] Error handling monitoring module (GeoNode#7995)

* [Fixes GeoNode#7948] Error handling monitoring module

* [Fixes GeoNode#7948] Error handling monitoring module

Author: Alessio Fabiani

geonode/base/__init__.py

@@ -16,8 +16,11 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 #########################################################################
+from functools import wraps
 
+from django.conf import settings
 from django.utils.translation import ugettext_noop as _
+
 from geonode.notifications_helper import NotificationsAppConfigBase
 
 
@@ -28,3 +31,58 @@ class BaseAppConfig(NotificationsAppConfigBase):
                      ("request_resource_edit", _("Request resource change"),
                       _("Owner has requested permissions to modify a resource")),
                      )
+
+
+def register_url_event(event_type=None):
+    """
+    Decorator on views, which will register url event
+
+    usage:
+    >> register_url_event()(TemplateView.view_as_view())
+
+    """
+    def _register_url_event(view):
+        @wraps(view)
+        def inner(*args, **kwargs):
+            if settings.MONITORING_ENABLED:
+                request = args[0]
+                register_event(request, event_type or 'view', request.path)
+            return view(*args, **kwargs)
+        return inner
+    return _register_url_event
+
+
+def register_event(request, event_type, resource):
+    """
+    Wrapper function to be used inside views to collect event and resource
+
+    @param request Request object
+    @param event_type name of event type
+    @param resource string (then resource type will be url) or Resource instance
+
+    >>> from geonode.base import register_event
+    >>> def view(request):
+            register_event(request, 'view', layer)
+    """
+    if not settings.MONITORING_ENABLED:
+        return
+
+    from geonode.base.models import ResourceBase
+    if isinstance(resource, str):
+        resource_type = 'url'
+        resource_name = request.path
+        resource_id = None
+    elif isinstance(resource, ResourceBase):
+        resource_type = resource.__class__._meta.verbose_name_raw
+        resource_name = getattr(resource, 'alternate', None) or resource.title
+        resource_id = resource.id
+    else:
+        raise ValueError(f"Invalid resource: {resource}")
+    if request and hasattr(request, 'register_event'):
+        request.register_event(event_type, resource_type, resource_name, resource_id)
+
+
+def register_proxy_event(request):
+    """
+    Process request to geoserver proxy. Extract layer and ows type
+    """

geonode/base/views.py

@@ -40,7 +40,7 @@
 from geonode.maps.models import Map
 from geonode.layers.models import Dataset
 from geonode.utils import resolve_object
-from geonode.monitoring import register_event
+from geonode.base import register_event
 from geonode.documents.models import Document
 from geonode.groups.models import GroupProfile
 from geonode.tasks.tasks import set_permissions

geonode/documents/urls.py

@@ -23,7 +23,7 @@
 from .views import DocumentUploadView, DocumentUpdateView
 from .views import DocumentAutocomplete
 from . import views
-from geonode.monitoring import register_url_event
+from geonode.base import register_url_event
 
 js_info_dict = {
     'packages': ('geonode.documents',),

geonode/documents/utils.py

@@ -34,7 +34,7 @@
 
 # Geonode functionality
 from geonode.documents.models import Document
-from geonode.monitoring import register_event
+from geonode.base import register_event
 from geonode.monitoring.models import EventType
 
 logger = logging.getLogger(__name__)

geonode/documents/views.py

@@ -44,7 +44,7 @@
 from geonode.base.views import batch_modify
 from geonode.utils import build_social_links
 from geonode.people.forms import ProfileForm
-from geonode.monitoring import register_event
+from geonode.base import register_event
 from geonode.base.bbox_utils import BBOXHelper
 from geonode.groups.models import GroupProfile
 from geonode.monitoring.models import EventType

geonode/geoapps/urls.py

@@ -19,7 +19,7 @@
 from django.conf.urls import url, include
 from django.views.generic import TemplateView
 
-from geonode.monitoring import register_url_event
+from geonode.base import register_url_event
 
 from . import views
 

geonode/geoapps/views.py

@@ -35,7 +35,7 @@
 from django.views.decorators.clickjacking import xframe_options_sameorigin
 
 from geonode.people.forms import ProfileForm
-from geonode.monitoring import register_event
+from geonode.base import register_event
 from geonode.groups.models import GroupProfile
 from geonode.monitoring.models import EventType
 from geonode.base.auth import get_or_create_token

geonode/layers/urls.py

@@ -21,7 +21,7 @@
 from geonode.utils import check_ogc_backend
 from django.conf.urls import url, include
 from django.views.generic import TemplateView
-from geonode.monitoring import register_url_event
+from geonode.base import register_url_event
 
 from . import views
 

geonode/layers/views.py

@@ -82,7 +82,7 @@
     validate_input_source)
 from geonode.maps.models import Map
 from geonode.services.models import Service
-from geonode.monitoring import register_event
+from geonode.base import register_event
 from geonode.monitoring.models import EventType
 from geonode.groups.models import GroupProfile
 from geonode.security.views import _perms_info_json

geonode/maps/urls.py

@@ -19,7 +19,7 @@
 
 from django.conf.urls import url, include
 from django.views.generic import TemplateView
-from geonode.monitoring import register_url_event
+from geonode.base import register_url_event
 
 from . import views