Changeset: 117b17ffd354 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/117b17ffd354
Modified Files:
tools/monetdbe/monetdbe.c
tools/monetdbe/monetdbe.h
Branch: embedded_mapi
Log Message:
Add host field to mapi server options in monetdbe.
diffs (42 lines):
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -646,8 +646,18 @@ monetdbe_startup(monetdbe_database_inter
if (opts && opts->mapi_server) {
/*This monetdbe instance wants to listen to external mapi
client connections.*/
- with_mapi_server = true;
+ if (opts->mapi_server->host) {
+ with_mapi_server = true;
+ int psetlen = setlen;
+ setlen = mo_add_option(&set, setlen, opt_cmdline,
"mapi_listenaddr", opts->mapi_server->host);
+ if (setlen == psetlen) {
+ mo_free_options(set, setlen);
+ set_error(mdbe, createException(MAL,
"monetdbe.monetdbe_startup", MAL_MALLOC_FAIL));
+ goto cleanup;
+ }
+ }
if (opts->mapi_server->port) {
+ with_mapi_server = true;
int psetlen = setlen;
setlen = mo_add_option(&set, setlen, opt_cmdline,
"mapi_port", opts->mapi_server->port);
if (setlen == psetlen) {
@@ -657,6 +667,7 @@ monetdbe_startup(monetdbe_database_inter
}
}
if (opts->mapi_server->usock) {
+ with_mapi_server = true;
int psetlen = setlen;
setlen = mo_add_option(&set, setlen, opt_cmdline,
"mapi_usock", opts->mapi_server->usock);
if (setlen == psetlen) {
diff --git a/tools/monetdbe/monetdbe.h b/tools/monetdbe/monetdbe.h
--- a/tools/monetdbe/monetdbe.h
+++ b/tools/monetdbe/monetdbe.h
@@ -103,6 +103,7 @@ typedef struct {
} monetdbe_remote;
typedef struct {
+ const char *host;
const char* port;
const char* usock;
} monetdbe_mapi_server;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
