Changeset: aaf82719d970 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=aaf82719d970
Modified Files:
tools/merovingian/client/monetdb.c
tools/merovingian/utils/control.c
Branch: Dec2011
Log Message:
monetdb: improve error messages
- don't reference merovingian, but monetdbd
- make error output consistent over commands
- don't mention "internal errors", in reality we ignore all of those
diffs (198 lines):
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -222,7 +222,7 @@ MEROgetStatus(sabdb **ret, char *databas
e = msab_deserialise(&stats, p);
if (e != NULL) {
printf("WARNING: failed to parse response from "
- "merovingian: %s\n", e);
+ "monetdbd: %s\n", e);
free(e);
continue;
}
@@ -513,7 +513,7 @@ simple_argv_cmd(char *cmd, sabdb *dbs, c
if (ret != NULL) {
if (premsg != NULL && !monetdb_quiet)
printf("FAILED\n");
- fprintf(stderr, "%s: failed to perform command: %s\n",
+ fprintf(stderr, "%s: %s\n",
cmd, ret);
free(ret);
exit(2);
@@ -583,7 +583,7 @@ simple_command(int argc, char *argv[], c
if (glob) {
if ((e = MEROgetStatus(&orig, NULL)) != NULL) {
- fprintf(stderr, "%s: internal error: %s\n", argv[0], e);
+ fprintf(stderr, "%s: %s\n", argv[0], e);
free(e);
exit(2);
}
@@ -690,7 +690,7 @@ command_status(int argc, char *argv[])
}
if ((e = MEROgetStatus(&orig, NULL)) != NULL) {
- fprintf(stderr, "status: internal error: %s\n", e);
+ fprintf(stderr, "status: %s\n", e);
free(e);
exit(2);
}
@@ -923,7 +923,7 @@ command_startstop(int argc, char *argv[]
}
if ((e = MEROgetStatus(&orig, NULL)) != NULL) {
- fprintf(stderr, "%s: internal error: %s\n", type, e);
+ fprintf(stderr, "%s: %s\n", type, e);
free(e);
exit(2);
}
@@ -1051,7 +1051,7 @@ command_set(int argc, char *argv[], mero
}
if ((e = MEROgetStatus(&orig, NULL)) != NULL) {
- fprintf(stderr, "%s: internal error: %s\n", argv[0], e);
+ fprintf(stderr, "%s: %s\n", argv[0], e);
free(e);
exit(2);
}
@@ -1169,7 +1169,7 @@ command_get(int argc, char *argv[])
exit(1);
}
if ((e = MEROgetStatus(&orig, NULL)) != NULL) {
- fprintf(stderr, "get: internal error: %s\n", e);
+ fprintf(stderr, "get: %s\n", e);
free(e);
exit(2);
}
@@ -1191,7 +1191,7 @@ command_get(int argc, char *argv[])
e = control_send(&buf, mero_host, mero_port,
"#defaults", "get", 1, mero_pass);
if (e != NULL) {
- fprintf(stderr, "get: internal error: %s\n", e);
+ fprintf(stderr, "get: %s\n", e);
free(e);
exit(2);
} else if (strncmp(buf, "OK\n", 3) != 0) {
@@ -1214,7 +1214,7 @@ command_get(int argc, char *argv[])
e = control_send(&buf, mero_host, mero_port,
stats->dbname, "get", 1, mero_pass);
if (e != NULL) {
- fprintf(stderr, "get: internal error: %s\n", e);
+ fprintf(stderr, "get: %s\n", e);
free(e);
exit(2);
} else if (strncmp(buf, "OK\n", 3) != 0) {
@@ -1409,7 +1409,7 @@ command_destroy(int argc, char *argv[])
}
if ((e = MEROgetStatus(&orig, NULL)) != NULL) {
- fprintf(stderr, "destroy: internal error: %s\n", e);
+ fprintf(stderr, "destroy: %s\n", e);
free(e);
exit(2);
}
diff --git a/tools/merovingian/utils/control.c
b/tools/merovingian/utils/control.c
--- a/tools/merovingian/utils/control.c
+++ b/tools/merovingian/utils/control.c
@@ -106,7 +106,7 @@ char* control_send(
len += recv(sock, sbuf + len, sizeof(sbuf) - len, 0);
/* perform login ritual */
if (len <= 0) {
- snprintf(sbuf, sizeof(sbuf), "no response from
merovingian");
+ snprintf(sbuf, sizeof(sbuf), "no response from
monetdbd");
return(strdup(sbuf));
}
/* we only understand merovingian:1 and :2 (backwards compat
@@ -131,7 +131,7 @@ char* control_send(
"instead of monetdbd?");
} else {
snprintf(sbuf, sizeof(sbuf), "cannot connect: "
- "unsupported merovingian
server");
+ "unsupported monetdbd server");
}
return(strdup(sbuf));
}
@@ -167,21 +167,21 @@ char* control_send(
p = strchr(chal, ':');
if (p == NULL) {
snprintf(sbuf, sizeof(sbuf), "cannot
connect: "
- "invalid challenge from
merovingian server");
+ "invalid challenge from
monetdbd server");
return(strdup(sbuf));
}
*p++ = '\0'; /* servertype */
p = strchr(p, ':');
if (p == NULL) {
snprintf(sbuf, sizeof(sbuf), "cannot
connect: "
- "invalid challenge from
merovingian server");
+ "invalid challenge from
monetdbd server");
return(strdup(sbuf));
}
*p++ = '\0'; /* protover */
p = strchr(p, ':');
if (p == NULL) {
snprintf(sbuf, sizeof(sbuf), "cannot
connect: "
- "invalid challenge from
merovingian server");
+ "invalid challenge from
monetdbd server");
return(strdup(sbuf));
}
*p++ = '\0'; /* algos */
@@ -189,14 +189,14 @@ char* control_send(
p = strchr(p, ':');
if (p == NULL) {
snprintf(sbuf, sizeof(sbuf), "cannot
connect: "
- "invalid challenge from
merovingian server");
+ "invalid challenge from
monetdbd server");
return(strdup(sbuf));
}
*p++ = '\0'; /* endian */
p = strchr(p, ':');
if (p == NULL) {
snprintf(sbuf, sizeof(sbuf), "cannot
connect: "
- "invalid challenge from
merovingian server");
+ "invalid challenge from
monetdbd server");
return(strdup(sbuf));
}
*p++ = '\0'; /* hash */
@@ -204,7 +204,7 @@ char* control_send(
p = strchr(p, ':');
if (p == NULL) {
snprintf(sbuf, sizeof(sbuf), "cannot
connect: "
- "invalid challenge from
merovingian server");
+ "invalid challenge from
monetdbd server");
return(strdup(sbuf));
}
*p = '\0';
@@ -227,7 +227,7 @@ char* control_send(
phash = mcrypt_MD5Sum(pass,
strlen(pass));
} else {
snprintf(sbuf, sizeof(sbuf), "cannot
connect: "
- "server requires
unknown hash '%s'", shash);
+ "monetdbd server
requires unknown hash: %s", shash);
return(strdup(sbuf));
}
@@ -274,7 +274,7 @@ char* control_send(
len = recv(sock, sbuf, sizeof(sbuf), 0);
if (len <= 0)
- return(strdup("no response from merovingian"));
+ return(strdup("no response from monetdbd after login"));
if (len == 2) /* blockmode bytes? try reading more */
len += recv(sock, sbuf + 2, sizeof(sbuf) - 2, 0);
sbuf[len - 1] = '\0';
@@ -310,12 +310,12 @@ char* control_send(
bufpos += len;
}
if (bufpos == 0)
- return(strdup("no response from merovingian"));
+ return(strdup("incomplete response from monetdbd"));
buf[bufpos - 1] = '\0';
*ret = buf;
} else {
if ((len = recv(sock, sbuf, sizeof(sbuf), 0)) <= 0)
- return(strdup("no response from merovingian"));
+ return(strdup("incomplete response from monetdbd"));
sbuf[len - 1] = '\0';
*ret = strdup(sbuf);
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
