strftime(tbuf,sizeof(tbuf)-1,"%Y/%m/%d %H:%M:%S", tm);
-- printf("%s.%06u [%5u]: %s", tbuf, (unsigned)t.tv_usec, (unsigned)getpid(), s);
-- fflush(stdout);
++ fprintf(stderr, "%s.%06u [%5u]: %s", tbuf, (unsigned)t.tv_usec, (unsigned)getpid(), s);
++ fflush(stderr);
free(s);
}
struct ctdb_vnn_map *vnnmap=NULL;
struct ctdb_node_map *nodemap=NULL;
uint32_t recmode, recmaster;
-- uint32_t myvnn;
++ int myvnn;
myvnn = ctdb_ctrl_getvnn(ctdb, TIMELIMIT(), options.vnn);
++ if (myvnn == -1) {
++ return -1;
++ }
ret = ctdb_ctrl_getnodemap(ctdb, TIMELIMIT(), options.vnn, ctdb, &nodemap);
if (ret != 0) {
{
int i, ret;
struct ctdb_all_public_ips *ips;
-- uint32_t myvnn;
++ int myvnn;
myvnn = ctdb_ctrl_getvnn(ctdb, TIMELIMIT(), options.vnn);
++ if (myvnn == -1) {
++ return -1;
++ }
ret = ctdb_ctrl_get_public_ips(ctdb, TIMELIMIT(), options.vnn, ctdb, &ips);
if (ret != 0) {
return 0;
}
- uint32_t myvnn;
+ /*
+ display public ip address of this node
+ */
+ static int control_publicip(struct ctdb_context *ctdb, int argc, const char **argv)
+ {
+ int ret;
+ struct ctdb_all_public_ips *ips;
++ int myvnn;
+
+ myvnn = ctdb_ctrl_getvnn(ctdb, TIMELIMIT(), options.vnn);
++ if (myvnn == -1) {
++ return -1;
++ }
+
+ ret = ctdb_ctrl_get_public_ips(ctdb, TIMELIMIT(), options.vnn, ctdb, &ips);
+ if (ret != 0) {
+ fprintf(stderr, "Unable to get public ips from node %u\n", options.vnn);
+ return ret;
+ }
+
+ printf("%-16s\n", inet_ntoa(ips->ips[myvnn].sin.sin_addr));
+
+ return 0;
+ }
+
/*
display pid of a ctdb daemon
*/
int j;
if (options.vnn == CTDB_CURRENT_NODE) {
-- options.vnn = ctdb_ctrl_getvnn(ctdb, TIMELIMIT(), options.vnn);
++ int vnn;
++ vnn = ctdb_ctrl_getvnn(ctdb, TIMELIMIT(), options.vnn);
++ if (vnn == -1) {
++ return -1;
++ }
++ options.vnn = vnn;
}
if (ctdb_commands[i].auto_all &&