hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-08-28 16:06:23 +03:00
parent 2f7ed85b3f 51ade9e6fe
commit 9a6f1b2044
9 changed files with 137 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/modules/routing/avrorouter/avro_client.cc
View File

@ -343,17 +343,17 @@ void AvroSession::process_command(GWBUF *queue)
}
else
{
dcb_printf(dcb, "ERR NO-FILE File '%s' not found.", avro_binfile.c_str());
dcb_printf(dcb, "ERR NO-FILE File '%s' not found.\n", avro_binfile.c_str());
}
}
else
{
dcb_printf(dcb, "ERR REQUEST-DATA with no data");
dcb_printf(dcb, "ERR REQUEST-DATA with no data\n");
}
}
else
{
const char err[] = "ERR: Unknown command";
const char err[] = "ERR: Unknown command\n";
GWBUF *reply = gwbuf_alloc_and_load(sizeof(err), err);
dcb->func.write(dcb, reply);
}
@ -571,8 +571,7 @@ bool AvroSession::stream_data()
}
else
{
fprintf(stderr, "No file specified\n");
dcb_printf(dcb, "ERR avro file not specified");
dcb_printf(dcb, "ERR avro file not specified\n");
}
return read_more;