[sr-dev] git:master:ad368c93: kazoo: add zone to connection event

[lazedo]

Module: kamailio
Branch: master
Commit: ad368c93cb01f1375bb69acc09ea2b4431b9db77
URL: https://github.com/kamailio/kamailio/commit/ad368c93cb01f1375bb69acc09ea2b4431b9db77

Author: Luis Azedo <luis at 2600hz.com>
Committer: lazedo <luis.azedo at factorlusitano.com>
Date: 2017-04-06T14:09:41+01:00

kazoo: add zone to connection event

---

Modified: src/modules/kazoo/kz_amqp.c
Modified: src/modules/kazoo/kz_amqp.h

---

Diff:  https://github.com/kamailio/kamailio/commit/ad368c93cb01f1375bb69acc09ea2b4431b9db77.diff
Patch: https://github.com/kamailio/kamailio/commit/ad368c93cb01f1375bb69acc09ea2b4431b9db77.patch

---

diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c
index 8bbbcd8..8dd1350 100644
--- a/src/modules/kazoo/kz_amqp.c
+++ b/src/modules/kazoo/kz_amqp.c
@@ -744,7 +744,7 @@ void kz_amqp_connection_close(kz_amqp_conn_ptr rmq) {
     if(rmq->heartbeat)
         kz_amqp_timer_destroy(&rmq->heartbeat);
 
-    kz_amqp_fire_connection_event("closed", rmq->server->connection->info.host);
+    kz_amqp_fire_connection_event("closed", rmq->server->connection->info.host, rmq->server->zone->zone);
 
     if (rmq->conn) {
 		LM_DBG("close connection:  %d rmq(%p)->conn(%p)\n", getpid(), (void *)rmq, rmq->conn);
@@ -2081,13 +2081,13 @@ void kz_amqp_send_consumer_event(char* payload, int nextConsumer)
 	kz_amqp_send_consumer_event_ex(payload, NULL, NULL, 0, 0, nextConsumer);
 }
 
-void kz_amqp_fire_connection_event(char *event, char* host)
+void kz_amqp_fire_connection_event(char *event, char* host, char* zone)
 {
 	char* payload = (char*)shm_malloc(512);
-	sprintf(payload, "{ \"%.*s\" : \"connection\", \"%.*s\" : \"%s\", \"host\" : \"%s\" }",
+	sprintf(payload, "{ \"%.*s\" : \"connection\", \"%.*s\" : \"%s\", \"host\" : \"%s\", \"zone\" : \"%s\" }",
 			dbk_consumer_event_key.len, dbk_consumer_event_key.s,
 			dbk_consumer_event_subkey.len, dbk_consumer_event_subkey.s,
-			event, host
+			event, host, zone
 			);
 	kz_amqp_send_consumer_event(payload, 1);
 }
@@ -2264,7 +2264,7 @@ int kz_amqp_connect(kz_amqp_conn_ptr rmq)
 	if(kz_amqp_connection_open(rmq) != 0)
 		goto error;
 
-	kz_amqp_fire_connection_event("open", rmq->server->connection->info.host);
+	kz_amqp_fire_connection_event("open", rmq->server->connection->info.host, rmq->server->zone->zone);
 	for(i=0,channel_res=0; i < dbk_channels && channel_res == 0; i++) {
 			/* start cleanup */
 			rmq->server->channels[i].state = KZ_AMQP_CHANNEL_CLOSED;
@@ -2698,7 +2698,7 @@ int kz_amqp_consumer_proc(kz_amqp_server_ptr server_ptr)
    			sleep(3);
    			continue;
    		}
-    	kz_amqp_fire_connection_event("open", server_ptr->connection->info.host);
+    	kz_amqp_fire_connection_event("open", server_ptr->connection->info.host, server_ptr->zone->zone);
 
     	/* reset channels */
 
diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h
index 7c5e6e8..f5d1345 100644
--- a/src/modules/kazoo/kz_amqp.h
+++ b/src/modules/kazoo/kz_amqp.h
@@ -272,7 +272,7 @@ kz_amqp_zone_ptr kz_amqp_get_zones();
 kz_amqp_zone_ptr kz_amqp_get_zone(char* zone);
 kz_amqp_zone_ptr kz_amqp_add_zone(char* zone);
 
-void kz_amqp_fire_connection_event(char *event, char* host);
+void kz_amqp_fire_connection_event(char *event, char* host, char* zone);
 
 void kz_amqp_free_pipe_cmd(kz_amqp_cmd_ptr cmd);