Commit e9332b81 authored by Alex Kakiris's avatar Alex Kakiris
Browse files

refine log levels in Events_API

parent e76b8e37

services/TS29222_CAPIF_Events_API/capif_events/controllers/capifs_events_subscriptions_collection_controller.py

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ def create_event_subsc(subscriber_id, body): # noqa: E501 


    :rtype: Union[EventSubscription, Tuple[EventSubscription, int], Tuple[EventSubscription, int, Dict[str, str]]

    """

    current_app.logger.info("Creating event subscription")

    current_app.logger.debug("Creating event subscription")

    if request.is_json:

        body = EventSubscription.from_dict(request.get_json())  # noqa: E501

services/TS29222_CAPIF_Events_API/capif_events/controllers/individual_capifs_events_subscription_document_controller.py

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ def delete_ind_event_subsc(subscriber_id, subscription_id): # noqa: E501 


    :rtype: Union[None, Tuple[None, int], Tuple[None, int, Dict[str, str]]

    """

    current_app.logger.info("Removing event subscription")

    current_app.logger.debug("Removing event subscription")



    res = events_ops.delete_event(subscriber_id, subscription_id)

services/TS29222_CAPIF_Events_API/capif_events/core/auth_manager.py

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class AuthManager(Resource): 
                cert_col.find_one_and_update({"id":subscriber_id}, {"$set":auth_context})



        except Exception as e:

            current_app.logger.info(f"Something wrong in remove auth resources: {e}")

            current_app.logger.error(f"Something wrong in remove auth resources: {e}")



    def remove_auth_all_event(self, subscriber_id):

services/TS29222_CAPIF_Events_API/capif_events/core/consumer_messager.py

+4 −4
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ class Subscriber(): 


    def listen(self):

        for raw_message in self.p.listen():

            current_app.logger.info(raw_message)

            current_app.logger.debug(raw_message)

            if raw_message["type"] == "message" and raw_message["channel"].decode('utf-8') == "events":

                current_app.logger.info("Event received")

                current_app.logger.debug("Event received")

                redis_event = json.loads(raw_message["data"].decode('utf-8'))

                current_app.logger.info(json.dumps(redis_event, indent=4))

                current_app.logger.debug(json.dumps(redis_event, indent=4))

                self.notification.send_notifications(redis_event)

            elif raw_message["type"] == "message" and raw_message["channel"].decode('utf-8') == "internal-messages":

                current_app.logger.info("New internal event received")

                current_app.logger.debug("New internal event received")

                internal_redis_event = json.loads(

                    raw_message["data"].decode('utf-8'))

                if internal_redis_event.get('event') == "INVOKER-REMOVED":

services/TS29222_CAPIF_Events_API/capif_events/core/events_apis.py

+15 −15
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class EventSubscriptionsOperations(Resource): 
        provider = mycol_provider.find_one(provider_query)



        if invoker is None and provider is None:

            current_app.logger.error("Not found invoker or provider with this subscriber id")

            current_app.logger.warning("Not found invoker or provider with this subscriber id")

            return not_found_error(detail="Invoker or APF or AEF or AMF Not found", cause="Subscriber Not Found")



        return None
@@ -76,7 +76,7 @@ class EventSubscriptionsOperations(Resource): 
            invalid_filters = set(filter.keys()) - set(valid_filters.get(event, []))



            if invalid_filters:

                 current_app.logger.debug(f"The eventFilter {invalid_filters} for event {event} are not applicable.")

                 current_app.logger.warning(f"The eventFilter {invalid_filters} for event {event} are not applicable.")

                 return bad_request_error(detail="Bad Param", cause = f"Invalid eventFilter for event {event}", invalid_params=[{"param": "eventFilter", "reason": f"The eventFilter {invalid_filters} for event {event} are not applicable."}])

        return None
@@ -87,7 +87,7 @@ class EventSubscriptionsOperations(Resource): 
            if event_subscription.event_req.mon_dur > datetime.now(timezone.utc):

                expired_at = event_subscription.event_req.mon_dur

            else:

                current_app.logger.error("monDur is in the past")

                current_app.logger.warning("monDur is in the past")

                return bad_request_error(

                    detail="Bad Param",

                    cause="monDur is in the past",
@@ -95,7 +95,7 @@ class EventSubscriptionsOperations(Resource): 
                )

        

        if event_subscription.event_req.notif_method == "PERIODIC" and event_subscription.event_req.rep_period is None:

            current_app.logger.error("Periodic notification method selected but repPeriod not provided")

            current_app.logger.warning("Periodic notification method selected but repPeriod not provided")

            return bad_request_error(

                detail="Bad Param",

                cause="Periodic notification method selected but repPeriod not provided",
@@ -123,7 +123,7 @@ class EventSubscriptionsOperations(Resource): 
            current_app.logger.debug("Creating event")



            if rfc3987.match(event_subscription.notification_destination, rule="URI") is None:

                current_app.logger.error("Bad url format")

                current_app.logger.warning("Bad url format")

                return bad_request_error(detail="Bad Param", cause = "Detected Bad formar of param", invalid_params=[{"param": "notificationDestination", "reason": "Not valid URL format"}])



            if event_subscription.supported_features is None:
@@ -158,14 +158,14 @@ class EventSubscriptionsOperations(Resource): 
                        return result

            else:

                if event_subscription.event_filters:

                    current_app.logger.error("Event filters provided but EnhancedEventReport is not enabled")

                    current_app.logger.warning("Event filters provided but EnhancedEventReport is not enabled")

                    return bad_request_error(

                        detail="Bad Param",

                        cause="Event filters provided but EnhancedEventReport is not enabled",

                        invalid_params=[{"param": "eventFilters", "reason": "EnhancedEventReport is not enabled"}]

                    )

                if event_subscription.event_req:

                    current_app.logger.error("Event requirement provided but EnhancedEventReport is not enabled")

                    current_app.logger.warning("Event requirement provided but EnhancedEventReport is not enabled")

                    return bad_request_error(

                        detail="Bad Param",

                        cause="Event requirement provided but EnhancedEventReport is not enabled",
@@ -186,7 +186,7 @@ class EventSubscriptionsOperations(Resource): 
            evnt.update(event_subscription.to_dict())

            mycol.insert_one(evnt)



            current_app.logger.debug("Event Subscription inserted in database")

            current_app.logger.info("Event Subscription inserted in database")



            self.auth_manager.add_auth_event(subscription_id, subscriber_id)
@@ -219,12 +219,12 @@ class EventSubscriptionsOperations(Resource): 
            eventdescription = mycol.find_one(my_query)



            if eventdescription is None:

                current_app.logger.error("Event subscription not found")

                current_app.logger.warning("Event subscription not found")

                return not_found_error(detail="Event subscription not exist", cause="Event API subscription id not found")



            mycol.delete_one(my_query)

            notifications_col.delete_many({"subscription_id": subscription_id})

            current_app.logger.debug("Event subscription removed from database")

            current_app.logger.info("Event subscription removed from database")



            self.auth_manager.remove_auth_event(subscription_id, subscriber_id)
@@ -272,14 +272,14 @@ class EventSubscriptionsOperations(Resource): 
                        return result

            else:

                if event_subscription.event_filters:

                    current_app.logger.error("Event filters provided but EnhancedEventReport is not enabled")

                    current_app.logger.warning("Event filters provided but EnhancedEventReport is not enabled")

                    return bad_request_error(

                        detail="Bad Param",

                        cause="Event filters provided but EnhancedEventReport is not enabled",

                        invalid_params=[{"param": "eventFilters", "reason": "EnhancedEventReport is not enabled"}]

                    )

                if event_subscription.event_req:

                    current_app.logger.error("Event requirement provided but EnhancedEventReport is not enabled")

                    current_app.logger.warning("Event requirement provided but EnhancedEventReport is not enabled")

                    return bad_request_error(

                        detail="Bad Param",

                        cause="Event requirement provided but EnhancedEventReport is not enabled",
@@ -302,7 +302,7 @@ class EventSubscriptionsOperations(Resource): 


            notifications_col.delete_many({"subscription_id": subscription_id})

            mycol.replace_one(my_query, body)

            current_app.logger.debug("Event subscription updated from database")

            current_app.logger.info("Event subscription updated from database")





            res = make_response(object=serialize_clean_camel_case(event_subscription), status=200)
@@ -332,7 +332,7 @@ class EventSubscriptionsOperations(Resource): 
            eventdescription = mycol.find_one(my_query)



            if eventdescription is None:

                current_app.logger.error("Event subscription not found")

                current_app.logger.warning("Event subscription not found")

                return not_found_error(detail="Event subscription not exist", cause="Event API subscription id not found")



            current_app.logger.debug(event_subscription)
@@ -368,7 +368,7 @@ class EventSubscriptionsOperations(Resource): 
            notifications_col.delete_many({"subscription_id": subscription_id})

            document = mycol.update_one(my_query, {"$set":body})

            document = mycol.find_one(my_query)

            current_app.logger.debug("Event subscription patched from database")

            current_app.logger.info("Event subscription patched from database")



            res = make_response(object=EventSubscription.from_dict(dict_to_camel_case(document)), status=200)