Changed from server unique name to ip:port in monitor script initiaion.
This commit is contained in:
@ -230,7 +230,7 @@ void mon_append_node_names(MONITOR_SERVERS* start,char* str, int len)
|
|||||||
MONITOR_SERVERS* ptr = start;
|
MONITOR_SERVERS* ptr = start;
|
||||||
bool first = true;
|
bool first = true;
|
||||||
int slen = strlen(str);
|
int slen = strlen(str);
|
||||||
|
char arr[256];
|
||||||
while(ptr && slen < len)
|
while(ptr && slen < len)
|
||||||
{
|
{
|
||||||
if(!first)
|
if(!first)
|
||||||
@ -238,7 +238,8 @@ void mon_append_node_names(MONITOR_SERVERS* start,char* str, int len)
|
|||||||
strncat(str,",",len);
|
strncat(str,",",len);
|
||||||
}
|
}
|
||||||
first = false;
|
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;
|
ptr = ptr->next;
|
||||||
slen = strlen(str);
|
slen = strlen(str);
|
||||||
}
|
}
|
||||||
@ -299,10 +300,11 @@ void monitor_launch_script(MONITOR* mon,MONITOR_SERVERS* ptr, char* script)
|
|||||||
EXTERNCMD* cmd;
|
EXTERNCMD* cmd;
|
||||||
|
|
||||||
snprintf(argstr,PATH_MAX + MON_ARG_MAX,
|
snprintf(argstr,PATH_MAX + MON_ARG_MAX,
|
||||||
"%s --event=%s --initiator=%s --nodelist=",
|
"%s --event=%s --initiator=%s:%d --nodelist=",
|
||||||
script,
|
script,
|
||||||
mon_get_event_name(ptr),
|
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);
|
mon_append_node_names(mon->databases,argstr,PATH_MAX + MON_ARG_MAX + 1);
|
||||||
if((cmd = externcmd_allocate(argstr)) == NULL)
|
if((cmd = externcmd_allocate(argstr)) == NULL)
|
||||||
|
Reference in New Issue
Block a user