Changeset: c3794a45a001 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c3794a45a001 Modified Files: sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 sql/src/backends/monet5/merovingian/merovingian.c sql/src/backends/monet5/merovingian/monetdb.c Branch: Jun2010 Log Message:
Report MonetDB release on --version flags and in the logs. Fix --version and --help command to actually work in monetdb Report an error when unknown command flags are passed onto monetdb Shutdown merovingian immediately when reporting version instead of silently continuing to run. diffs (90 lines): diff -r 951e402f0f02 -r c3794a45a001 sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 --- a/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Wed Jul 21 15:29:29 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/ChangeLog.Jun2010 Wed Jul 21 19:57:00 2010 +0200 @@ -1,6 +1,9 @@ # ChangeLog file for sql/src/backends/monet5/merovingian # This file is updated with mchangelog + 21 Jul 2010; Fabian Groffen <[email protected]> merovingian.c, monetdb.c: + Report MonetDB release on --version flags and in the logs. + 16 Jul 2010; Fabian Groffen <[email protected]> merovingian.c, merovingian_forkmserver.c, monetdb.1.in, properties.c: Remove references to master/slave settings, since replication isn't yet diff -r 951e402f0f02 -r c3794a45a001 sql/src/backends/monet5/merovingian/merovingian.c --- a/sql/src/backends/monet5/merovingian/merovingian.c Wed Jul 21 15:29:29 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/merovingian.c Wed Jul 21 19:57:00 2010 +0200 @@ -666,8 +666,8 @@ gethostname(_mero_hostname, 128); if (argc > 1) { - Mfprintf(stderr, "Merovingian %s on host %s\n", MERO_VERSION, - _mero_hostname /*FIXME not yet set*/); + Mfprintf(stderr, "Merovingian %s (%s) on host %s\n", MERO_VERSION, + MONETDB_RELEASE, _mero_hostname); Mfprintf(stderr, "Using config file: %s\n", _mero_conffile); Mfprintf(stderr, " monitoring dbfarm: %s\n", dbfarm); Mfprintf(stderr, " forking mserver5: %s\n", _mero_mserver); @@ -676,6 +676,7 @@ Mfprintf(stderr, " performs neighbour discovery: %s\n", (discoveryport != 0 ? "yes" : "no")); MERO_EXIT(0); + return(0); } /* seed the randomiser for when we create a database, send responses @@ -906,7 +907,8 @@ MERO_EXIT(1); } - Mfprintf(stdout, "Merovingian %s starting\n", MERO_VERSION); + Mfprintf(stdout, "Merovingian %s (%s) starting\n", + MERO_VERSION, MONETDB_RELEASE); Mfprintf(stdout, "monitoring dbfarm %s\n", dbfarm); SABAOTHinit(dbfarm, NULL); diff -r 951e402f0f02 -r c3794a45a001 sql/src/backends/monet5/merovingian/monetdb.c --- a/sql/src/backends/monet5/merovingian/monetdb.c Wed Jul 21 15:29:29 2010 +0200 +++ b/sql/src/backends/monet5/merovingian/monetdb.c Wed Jul 21 19:57:00 2010 +0200 @@ -185,7 +185,8 @@ static void command_version() { - printf("MonetDB Database Server Toolkit v%s\n", TOOLKIT_VERSION); + printf("MonetDB Database Server Toolkit v%s (%s)\n", + TOOLKIT_VERSION, MONETDB_RELEASE); } /** @@ -1429,6 +1430,22 @@ } } break; + case '-': + /* skip -- */ + if (argv[i][2] == '\0') + break; + if (strcmp(&argv[i][2], "version") == 0) { + command_version(); + return(0); + } else if (strcmp(&argv[i][2], "help") == 0) { + command_help(0, NULL); + return(0); + } + default: + fprintf(stderr, "monetdb: unknown option: %s\n", argv[i]); + command_help(0, NULL); + return(1); + break; } } @@ -1453,7 +1470,7 @@ } /* commands that do not need merovingian to be running */ - if (strcmp(argv[i], "help") == 0 || strcmp(argv[i], "--help") == 0) { + if (strcmp(argv[i], "help") == 0) { command_help(argc - i, &argv[i]); return(0); } else if (strcmp(argv[i], "version") == 0) { _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
