[sr-dev] git:5.0:1293dc52: Revert "kazoo: add ksr_msg_env_reset after processing events"

[Daniel-Constantin Mierla]

You can backport if you need it now (as well as other related patches)
-- if not, I will do it in few days, as I will prepare the next release
in branch 5.0.


Cheers,
Daniel

On 19.05.17 17:11, Luis Azedo wrote:
>
> sorry,
>
> thought the new ksr_msg_env_reset was already backported.
>
>
> ------------------------------------------------------------------------
> *From:* sr-dev <sr-dev-bounces at lists.kamailio.org> on behalf of Luis
> Azedo <luis at 2600hz.com>
> *Sent:* Friday, May 19, 2017 4:10:18 PM
> *To:* sr-dev at lists.kamailio.org
> *Subject:* [sr-dev] git:5.0:1293dc52: Revert "kazoo: add
> ksr_msg_env_reset after processing events"
>  
> Module: kamailio
> Branch: 5.0
> Commit: 1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5
> URL:
> https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5
>
> Author: Luis Azedo <luis at 2600hz.com>
> Committer: Luis Azedo <luis at 2600hz.com>
> Date: 2017-05-19T16:10:00+01:00
>
> Revert "kazoo: add ksr_msg_env_reset after processing events"
>
> This reverts commit a5e68b5697688f82edbc48e64f32e15f89c8b357.
>
> ---
>
> Modified: src/modules/kazoo/kz_amqp.c
>
> ---
>
> Diff: 
> https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5.diff
> Patch:
> https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5.patch
>
> ---
>
> diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c
> index ca3a86a19c..da310893c9 100644
> --- a/src/modules/kazoo/kz_amqp.c
> +++ b/src/modules/kazoo/kz_amqp.c
> @@ -42,10 +42,6 @@
>  #include "../../core/mod_fix.h"
>  #include "../../core/lvalue.h"
>  #include "../tm/tm_load.h"
> -#include "../../core/route.h"
> -#include "../../core/receive.h"
> -#include "../../core/action.h"
> -#include "../../core/script_cb.h"
>  
>  
>  #include "kz_amqp.h"
> @@ -2284,14 +2280,11 @@ int kz_amqp_consumer_fire_event(char *eventkey)
>          fmsg = faked_msg_get_next();
>          rtb = get_route_type();
>          set_route_type(REQUEST_ROUTE);
> -       if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)!=0 ) {
> -               init_run_actions_ctx(&ctx);
> -               run_top_route(event_rt.rlist[rt], fmsg, 0);
> -               exec_post_script_cb(fmsg, REQUEST_CB_TYPE);
> -               ksr_msg_env_reset();
> -       }
> +       init_run_actions_ctx(&ctx);
> +       run_top_route(event_rt.rlist[rt], fmsg, 0);
>          set_route_type(rtb);
>          return 0;
> +
>  }
>  
>  void kz_amqp_consumer_event(char *payload, char* event_key, char*
> event_subkey)
> @@ -2415,7 +2408,6 @@ void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd)
>          }
>          struct action *a = main_rt.rlist[n];
>          tmb.t_continue(cmd->t_hash, cmd->t_label, a);
> -       ksr_msg_env_reset();
>  }
>  
>  void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd)
> @@ -2427,7 +2419,6 @@ void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd)
>          }
>          struct action *a = main_rt.rlist[n];
>          tmb.t_continue(cmd->t_hash, cmd->t_label, a);
> -       ksr_msg_env_reset();
>  }
>  
>  int kz_send_worker_error_event(kz_amqp_cmd_ptr cmd)
>
>
> _______________________________________________
> Kamailio (SER) - Development Mailing List
> sr-dev at lists.kamailio.org
> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
>
>
> _______________________________________________
> Kamailio (SER) - Development Mailing List
> sr-dev at lists.kamailio.org
> https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

-- 
Daniel-Constantin Mierla
www.twitter.com/miconda -- www.linkedin.com/in/miconda
Kamailio Advanced Training - May 22-24 (USA) - www.asipto.com
Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.kamailio.org/pipermail/sr-dev/attachments/20170519/3edac97e/attachment.html>