From f6369a1661a3ec785db2fd96c7b54881366deaad Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Thu, 18 Jun 2015 18:03:55 +0300 Subject: [PATCH] Changed from server unique name to ip:port in monitor script initiaion. --- server/modules/monitor/monitor_common.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/modules/monitor/monitor_common.c b/server/modules/monitor/monitor_common.c index f4566c35a..19980c5dd 100644 --- a/server/modules/monitor/monitor_common.c +++ b/server/modules/monitor/monitor_common.c @@ -230,7 +230,7 @@ void mon_append_node_names(MONITOR_SERVERS* start,char* str, int len) MONITOR_SERVERS* ptr = start; bool first = true; int slen = strlen(str); - + char arr[256]; while(ptr && slen < len) { if(!first) @@ -238,7 +238,8 @@ void mon_append_node_names(MONITOR_SERVERS* start,char* str, int len) strncat(str,",",len); } first = false; - strncat(str,ptr->server->unique_name,len); + sprintf(arr,"%s:%d",ptr->server->name,ptr->server->port); + strcat(str,arr); ptr = ptr->next; slen = strlen(str); } @@ -299,10 +300,11 @@ void monitor_launch_script(MONITOR* mon,MONITOR_SERVERS* ptr, char* script) EXTERNCMD* cmd; snprintf(argstr,PATH_MAX + MON_ARG_MAX, - "%s --event=%s --initiator=%s --nodelist=", + "%s --event=%s --initiator=%s:%d --nodelist=", script, mon_get_event_name(ptr), - ptr->server->unique_name); + ptr->server->name, + ptr->server->port); mon_append_node_names(mon->databases,argstr,PATH_MAX + MON_ARG_MAX + 1); if((cmd = externcmd_allocate(argstr)) == NULL)