Changeset: 9de6b4462914 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9de6b4462914
Modified Files:
tools/mserver/mserver5.c
Branch: mlogger
Log Message:
The Stalker enhanced mserver5 code
diffs (242 lines):
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -56,8 +56,7 @@
void
mserver_abort()
{
- fprintf(stderr, "\n! mserver_abort() was called by terminate(). !\n");
- fflush(stderr);
+ Stalker(FATAL, "\n! mserver_abort() was called by terminate(). !\n");
exit(0);
}
#endif
@@ -298,13 +297,13 @@ main(int argc, char **av)
#endif
#endif
if (setlocale(LC_CTYPE, "") == NULL) {
- fprintf(stderr, "cannot set locale\n");
+ Stalker(FATAL, "cannot set locale\n");
exit(1);
}
if (getcwd(monet_cwd, FILENAME_MAX - 1) == NULL) {
perror("pwd");
- fprintf(stderr,"monet_init: could not determine current
directory\n");
+ Stalker(FATAL, "monet_init: could not determine current
directory\n");
exit(-1);
}
@@ -340,14 +339,14 @@ main(int argc, char **av)
optarg[--optarglen] = '\0';
dbpath = absolute_path(optarg);
if( dbpath == NULL)
- fprintf(stderr, "#error: can not
allocate memory for dbpath\n");
+ Stalker(ERROR, "can not allocate memory
for dbpath\n");
else
setlen = mo_add_option(&set, setlen,
opt_cmdline, "gdk_dbpath", dbpath);
break;
}
if (strcmp(long_options[option_index].name, "dbextra")
== 0) {
if (dbextra)
- fprintf(stderr, "#warning: ignoring
multiple --dbextra arguments\n");
+ Stalker(WARNING,"ignoring multiple
--dbextra arguments\n");
else
dbextra = optarg;
break;
@@ -416,7 +415,7 @@ main(int argc, char **av)
char *endarg;
debug |= strtol(optarg, &endarg, 10);
if (*endarg != '\0') {
- fprintf(stderr, "ERROR: wrong format
for --debug=%s\n",
+ Stalker(ERROR,"wrong format for
--debug=%s\n",
optarg);
usage(prog, -1);
}
@@ -436,7 +435,7 @@ main(int argc, char **av)
*tmp = '\0';
setlen = mo_add_option(&set, setlen,
opt_cmdline, optarg, tmp + 1);
} else
- fprintf(stderr, "ERROR: wrong format %s\n",
optarg);
+ Stalker(ERROR,"wrong format %s\n", optarg);
}
break;
case 'v':
@@ -444,7 +443,7 @@ main(int argc, char **av)
char *endarg;
verbosity = (int) strtol(optarg, &endarg, 10);
if (*endarg != '\0') {
- fprintf(stderr, "ERROR: wrong format
for --verbose=%s\n",
+ Stalker(ERROR,"wrong format for
--verbose=%s\n",
optarg);
usage(prog, -1);
}
@@ -458,7 +457,7 @@ main(int argc, char **av)
it: if -? or --help, exit with 0, else with -1 */
usage(prog, strcmp(av[optind - 1], "-?") == 0 ||
strcmp(av[optind - 1], "--help") == 0 ? 0 : -1);
default:
- fprintf(stderr, "ERROR: getopt returned character "
+ Stalker(ERROR, "getopt returned character "
"code '%c' 0%o\n", c, (uint8_t) c);
usage(prog, -1);
}
@@ -476,30 +475,30 @@ main(int argc, char **av)
GDKsetverbose(verbosity);
if (dbpath && inmemory) {
- fprintf(stderr, "!ERROR: both dbpath and in-memory must not be
set at the same time\n");
+ Stalker(FATAL, "both dbpath and in-memory must not be set at
the same time\n");
exit(1);
}
if (!dbpath) {
dbpath = absolute_path(mo_find_option(set, setlen,
"gdk_dbpath"));
if (!dbpath) {
- fprintf(stderr, "!ERROR: cannot allocate memory for
database directory \n");
+ Stalker(FATAL, "cannot allocate memory for database
directory \n");
exit(1);
}
}
if (inmemory) {
if (BBPaddfarm(NULL, (1 << PERSISTENT) | (1 << TRANSIENT)) !=
GDK_SUCCEED) {
- fprintf(stderr, "!ERROR: cannot add in-memory farm\n");
+ Stalker(FATAL, "cannot add in-memory farm\n");
exit(1);
}
} else {
if (BBPaddfarm(dbpath, 1 << PERSISTENT) != GDK_SUCCEED ||
BBPaddfarm(dbextra ? dbextra : dbpath, 1 << TRANSIENT) !=
GDK_SUCCEED) {
- fprintf(stderr, "!ERROR: cannot add farm\n");
+ Stalker(FATAL, "cannot add farm\n");
exit(1);
}
if (GDKcreatedir(dbpath) != GDK_SUCCEED) {
- fprintf(stderr, "!ERROR: cannot create directory for
%s\n", dbpath);
+ Stalker(FATAL, "cannot create directory for %s\n",
dbpath);
exit(1);
}
}
@@ -507,7 +506,7 @@ main(int argc, char **av)
if (monet_init(set, setlen) == 0) {
mo_free_options(set, setlen);
if (GDKerrbuf && *GDKerrbuf)
- fprintf(stderr, "%s\n", GDKerrbuf);
+ Stalker(FATAL, "%s\n", GDKerrbuf);
exit(1);
}
mo_free_options(set, setlen);
@@ -520,7 +519,7 @@ main(int argc, char **av)
"unreleased"
#endif
) != GDK_SUCCEED) {
- fprintf(stderr, "!ERROR: GDKsetenv failed\n");
+ Stalker(FATAL, "GDKsetenv failed\n");
exit(1);
}
@@ -575,7 +574,7 @@ main(int argc, char **av)
}
if (modpath != NULL &&
GDKsetenv("monet_mod_path", modpath) != GDK_SUCCEED) {
- fprintf(stderr, "!ERROR: GDKsetenv failed\n");
+ Stalker(FATAL, "GDKsetenv failed\n");
exit(1);
}
}
@@ -592,7 +591,7 @@ main(int argc, char **av)
* even earlier? Sabaoth here registers the server is starting
up. */
if ((err = msab_registerStarting()) != NULL) {
/* throw the error at the user, but don't die */
- fprintf(stderr, "!%s\n", err);
+ Stalker(ERROR, "!%s\n", err);
free(err);
}
}
@@ -607,22 +606,22 @@ main(int argc, char **av)
if (sigaction(SIGINT, &sa, NULL) == -1 ||
sigaction(SIGQUIT, &sa, NULL) == -1 ||
sigaction(SIGTERM, &sa, NULL) == -1) {
- fprintf(stderr, "!unable to create signal handlers\n");
+ Stalker(ERROR, "unable to create signal handlers\n");
}
}
#else
#ifdef _MSC_VER
if (!SetConsoleCtrlHandler(winhandler, TRUE))
- fprintf(stderr, "!unable to create console control handler\n");
+ Stalker(ERROR, "unable to create console control handler\n");
#else
if(signal(SIGINT, handler) == SIG_ERR)
- fprintf(stderr, "!unable to create signal handlers\n");
+ Stalker(ERROR, "unable to create signal handlers\n");
#ifdef SIGQUIT
if(signal(SIGQUIT, handler) == SIG_ERR)
- fprintf(stderr, "!unable to create signal handlers\n");
+ Stalker(ERROR, "unable to create signal handlers\n");
#endif
if(signal(SIGTERM, handler) == SIG_ERR)
- fprintf(stderr, "!unable to create signal handlers\n");
+ Stalker(ERROR, "unable to create signal handlers\n");
#endif
#endif
@@ -631,7 +630,7 @@ main(int argc, char **av)
/* we inited mal before, so publish its existence */
if ((err = msab_marchScenario(lang)) != NULL) {
/* throw the error at the user, but don't die */
- fprintf(stderr, "!%s\n", err);
+ Stalker(ERROR, "%s\n", err);
free(err);
}
}
@@ -649,7 +648,7 @@ main(int argc, char **av)
snprintf(secret, sizeof(secret), "%s",
"Xas632jsi2whjds8");
} else {
if ((secretf = fopen(GDKgetenv("monet_vault_key"),
"r")) == NULL) {
- fprintf(stderr,
+ Stalker(FATAL,
"unable to open vault_key_file %s:
%s\n",
GDKgetenv("monet_vault_key"),
strerror(errno));
/* don't show this as a crash */
@@ -660,12 +659,12 @@ main(int argc, char **av)
secret[len] = '\0';
len = strlen(secret); /* secret can contain null-bytes
*/
if (len == 0) {
- fprintf(stderr, "vault key has zero-length!\n");
+ Stalker(FATAL, "vault key has zero-length!\n");
/* don't show this as a crash */
msab_registerStop();
exit(1);
} else if (len < 5) {
- fprintf(stderr, "#warning: your vault key is
too short "
+ Stalker(WARNING, "your vault key is too short "
"(%zu), enlarge
your vault key!\n", len);
}
fclose(secretf);
@@ -674,7 +673,7 @@ main(int argc, char **av)
/* don't show this as a crash */
if (!GDKinmemory())
msab_registerStop();
- fprintf(stderr, "%s\n", err);
+ Stalker(FATAL, "%s\n", err);
freeException(err);
exit(1);
}
@@ -684,7 +683,7 @@ main(int argc, char **av)
/* don't show this as a crash */
if (!GDKinmemory())
msab_registerStop();
- fprintf(stderr, "%s\n", err);
+ Stalker(FATAL, "%s\n", err);
freeException(err);
exit(1);
}
@@ -699,7 +698,7 @@ main(int argc, char **av)
if (!GDKinmemory() && (err = msab_registerStarted()) != NULL) {
/* throw the error at the user, but don't die */
- fprintf(stderr, "!%s\n", err);
+ Stalker(ERROR, "!%s\n", err);
free(err);
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
