Changeset: 41b19066710b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=41b19066710b Modified Files: tools/merovingian/ChangeLog.Aug2011 tools/merovingian/daemon/client.c tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/merovingian.c Branch: Aug2011 Log Message:
merovingian: announce to clients as monetdbd diffs (190 lines): diff --git a/tools/merovingian/ChangeLog.Aug2011 b/tools/merovingian/ChangeLog.Aug2011 --- a/tools/merovingian/ChangeLog.Aug2011 +++ b/tools/merovingian/ChangeLog.Aug2011 @@ -1,3 +1,7 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog +* Fri Sep 30 2011 Fabian Groffen <[email protected]> +- To avoid confusion, all occurrences of merovingian were changed into + monetdbd for error messages sent to a client. + diff --git a/tools/merovingian/daemon/client.c b/tools/merovingian/daemon/client.c --- a/tools/merovingian/daemon/client.c +++ b/tools/merovingian/daemon/client.c @@ -121,7 +121,7 @@ handleClient(int sock, char isusock) /* we didn't get a terminated block :/ */ e = newErr("client %s sent challenge in incomplete block: %s", host, buf); - mnstr_printf(fout, "!merovingian: client sent something this " + mnstr_printf(fout, "!monetdbd: client sent something this " "server could not understand, sorry\n"); mnstr_flush(fout); close_stream(fout); @@ -142,7 +142,7 @@ handleClient(int sock, char isusock) user = s + 1; } else { e = newErr("client %s challenge error: %s", host, buf); - mnstr_printf(fout, "!merovingian: incomplete challenge '%s'\n", user); + mnstr_printf(fout, "!monetdbd: incomplete challenge '%s'\n", user); mnstr_flush(fout); close_stream(fout); close_stream(fdin); @@ -157,7 +157,7 @@ handleClient(int sock, char isusock) /* decode algorithm, i.e. {plain}mypasswordchallenge */ if (*passwd != '{') { e = newErr("client %s challenge error: %s", host, buf); - mnstr_printf(fout, "!merovingian: invalid password entry\n"); + mnstr_printf(fout, "!monetdbd: invalid password entry\n"); mnstr_flush(fout); close_stream(fout); close_stream(fdin); @@ -167,7 +167,7 @@ handleClient(int sock, char isusock) s = strchr(algo, '}'); if (!s) { e = newErr("client %s challenge error: %s", host, buf); - mnstr_printf(fout, "!merovingian: invalid password entry\n"); + mnstr_printf(fout, "!monetdbd: invalid password entry\n"); mnstr_flush(fout); close_stream(fout); close_stream(fdin); @@ -177,7 +177,7 @@ handleClient(int sock, char isusock) passwd = s + 1; } else { e = newErr("client %s challenge error: %s", host, buf); - mnstr_printf(fout, "!merovingian: incomplete challenge '%s'\n", user); + mnstr_printf(fout, "!monetdbd: incomplete challenge '%s'\n", user); mnstr_flush(fout); close_stream(fout); close_stream(fdin); @@ -191,7 +191,7 @@ handleClient(int sock, char isusock) lang = s + 1; } else { e = newErr("client %s challenge error: %s", host, buf); - mnstr_printf(fout, "!merovingian: incomplete challenge, missing language\n"); + mnstr_printf(fout, "!monetdbd: incomplete challenge, missing language\n"); mnstr_flush(fout); close_stream(fout); close_stream(fdin); @@ -208,7 +208,7 @@ handleClient(int sock, char isusock) s = strchr(database, ':'); if (s == NULL) { e = newErr("client %s challenge error: %s", host, buf); - mnstr_printf(fout, "!merovingian: incomplete challenge, missing trailing colon\n"); + mnstr_printf(fout, "!monetdbd: incomplete challenge, missing trailing colon\n"); mnstr_flush(fout); close_stream(fout); close_stream(fdin); @@ -221,7 +221,7 @@ handleClient(int sock, char isusock) if (*database == '\0') { /* we need to have a database, if we haven't gotten one, * complain */ - mnstr_printf(fout, "!merovingian: please specify a database\n"); + mnstr_printf(fout, "!monetdbd: please specify a database\n"); mnstr_flush(fout); close_stream(fout); close_stream(fdin); @@ -243,7 +243,7 @@ handleClient(int sock, char isusock) w->next = mero_multiplex_funnel; if ((merr = multiplexInit(&w->mpf, database)) != NO_ERR) { free(w); - mnstr_printf(fout, "!merovingian: failed to create " + mnstr_printf(fout, "!monetdbd: failed to create " "multiplex-funnel: %s\n", merr); mnstr_flush(fout); close_stream(fout); @@ -255,7 +255,7 @@ handleClient(int sock, char isusock) NULL, (void *(*)(void *))multiplexThread, (void *)w->mpf)) != 0) { - mnstr_printf(fout, "!merovingian: internal failure while " + mnstr_printf(fout, "!monetdbd: internal failure while " "creating multiplex-funnel: unable to start thread: %s\n", strerror(ret)); mnstr_flush(fout); @@ -288,9 +288,9 @@ handleClient(int sock, char isusock) if ((e = forkMserver(database, &top, 0)) != NO_ERR) { if (top == NULL) { - mnstr_printf(fout, "!merovingian: no such database '%s', please create it first\n", database); + mnstr_printf(fout, "!monetdbd: no such database '%s', please create it first\n", database); } else { - mnstr_printf(fout, "!merovingian: internal error while starting mserver, please refer to the logs\n"); + mnstr_printf(fout, "!monetdbd: internal error while starting mserver, please refer to the logs\n"); } mnstr_flush(fout); close_stream(fout); @@ -319,7 +319,7 @@ handleClient(int sock, char isusock) } else { e = newErr("there are no available connections for '%s'", database); } - mnstr_printf(fout, "!merovingian: %s\n", e); + mnstr_printf(fout, "!monetdbd: %s\n", e); mnstr_flush(fout); close_stream(fout); close_stream(fdin); @@ -386,7 +386,7 @@ handleClient(int sock, char isusock) mnstr_printf(fout, "void:merovingian:8:plain:BIG"); mnstr_flush(fout); mnstr_read_block(fdin, buf, 8095, 1); /* eat away client response */ - mnstr_printf(fout, "!merovingian: an internal error has occurred, refer to the logs for details, please try again later\n"); + mnstr_printf(fout, "!monetdbd: an internal error has occurred, refer to the logs for details, please try again later\n"); mnstr_flush(fout); close_stream(fout); close_stream(fdin); diff --git a/tools/merovingian/daemon/forkmserver.c b/tools/merovingian/daemon/forkmserver.c --- a/tools/merovingian/daemon/forkmserver.c +++ b/tools/merovingian/daemon/forkmserver.c @@ -399,19 +399,19 @@ forkMserver(char *database, sabdb** stat "database '%s' has inconsistent state " "(sabaoth administration reports running, " "but process seems gone), " - "review merovingian's " + "review monetdbd's " "logfile for any peculiarities", database)); case SABdbCrashed: return(newErr( "database '%s' has crashed after starting, " "manual intervention needed, " - "check merovingian's logfile for details", + "check monetdbd's logfile for details", database)); case SABdbInactive: return(newErr( "database '%s' appears to shut " "itself down after starting, " - "check merovingian's logfile for possible " + "check monetdbd's logfile for possible " "hints", database)); default: return(newErr("unknown state: %d", (int)(*stats)->state)); @@ -434,7 +434,7 @@ forkMserver(char *database, sabdb** stat return(newErr( "database '%s' has crashed after starting, " "manual intervention needed, " - "check merovingian's logfile for details", + "check monetdbd's logfile for details", database)); case SABdbInactive: /* due to GDK only locking once it has loaded all @@ -447,7 +447,7 @@ forkMserver(char *database, sabdb** stat "database '%s' either needs a longer timeout " "to start up, or appears to shut " "itself down after starting, " - "review merovingian's logfile for any " + "review monetdbd's logfile for any " "peculiarities", database)); default: return(newErr("unknown state: %d", (int)(*stats)->state)); diff --git a/tools/merovingian/daemon/merovingian.c b/tools/merovingian/daemon/merovingian.c --- a/tools/merovingian/daemon/merovingian.c +++ b/tools/merovingian/daemon/merovingian.c @@ -728,7 +728,7 @@ main(int argc, char *argv[]) /* lock such that we are alone on this world */ if ((ret = MT_lockf(".merovingian_lock", F_TLOCK, 4, 1)) == -1) { /* locking failed */ - Mfprintf(stderr, "another merovingian is already running\n"); + Mfprintf(stderr, "another monetdbd is already running\n"); MERO_EXIT_CLEAN(1); } else if (ret == -2) { /* directory or something doesn't exist */ _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
