MonetDB: listenaddr - Improve reporting.

[Sjoerd Mullender]

Changeset: c52477e8dec2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c52477e8dec2
Modified Files:
        tools/merovingian/daemon/connections.c
        tools/merovingian/daemon/merovingian.c
Branch: listenaddr
Log Message:

Improve reporting.


diffs (74 lines):

diff --git a/tools/merovingian/daemon/connections.c 
b/tools/merovingian/daemon/connections.c
--- a/tools/merovingian/daemon/connections.c
+++ b/tools/merovingian/daemon/connections.c
@@ -43,8 +43,10 @@ openConnectionTCP(int *ret, bool bind_ip
        };
 
        check = getaddrinfo(bindaddr, sport, &hints, &result);
+       if (bindaddr == NULL)
+               bindaddr = "any";               /* provide something for 
messages */
        if (check != 0)
-               return newErr("cannot find host %s with error: %s", bindaddr ? 
bindaddr : "any", gai_strerror(check));
+               return newErr("cannot find host %s with error: %s", bindaddr, 
gai_strerror(check));
 
        for (rp = result; rp != NULL; rp = rp->ai_next) {
                sock = socket(rp->ai_family, rp->ai_socktype
@@ -85,7 +87,7 @@ openConnectionTCP(int *ret, bool bind_ip
                if (e != 0) { /* results found, tried socket, setsockopt and 
bind calls */
                        return newErr("binding to stream socket port %hu 
failed: %s", port, strerror(e));
                } else { /* no results found, could not translate address */
-                       return newErr("cannot translate host %s", bindaddr ? 
bindaddr : "any");
+                       return newErr("cannot translate host %s", bindaddr);
                }
        }
 
@@ -96,7 +98,7 @@ openConnectionTCP(int *ret, bool bind_ip
                return(newErr("failed setting socket to listen: %s", 
strerror(e)));
        }
 
-       Mfprintf(log, "accepting connections on TCP socket %s:%hu\n", bindaddr, 
port);
+       Mfprintf(log, "accepting connections on TCP socket %s:%hu\n", bindaddr 
, port);
 
        *ret = sock;
        return(NO_ERR);
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
@@ -483,7 +483,7 @@ main(int argc, char *argv[])
                        exit(command_set(ckv, argc - 1, &argv[1]));
                } else if (strcmp(argv[1], "start") == 0) {
                        if (argc > 3 && strcmp(argv[2], "-n") == 0)
-                                       merodontfork = 1;
+                               merodontfork = 1;
                        if (argc == 3 + merodontfork) {
                                int len;
                                len = snprintf(dbfarm, sizeof(dbfarm), "%s",
@@ -537,15 +537,17 @@ main(int argc, char *argv[])
                                        Mfprintf(stderr, "hmmm, can't detach 
from controlling tty, "
                                                        "continuing anyway\n");
                                if((retfd = open("/dev/null", O_RDONLY | 
O_CLOEXEC)) < 0) {
-                                       Mfprintf(stderr, "unable to dup 
stdin\n");
+                                       Mfprintf(stderr, "unable to dup stdin: 
%s\n", strerror(errno));
                                        return(1);
                                }
                                dup_err = dup2(retfd, 0);
+                               if(dup_err == -1) {
+                                       Mfprintf(stderr, "unable to dup stdin: 
%s\n", strerror(errno));
+                               }
                                close(retfd);
                                close(pfd[0]); /* close unused read end */
                                retfd = pfd[1]; /* store the write end */
                                if(dup_err == -1) {
-                                       Mfprintf(stderr, "unable to dup 
stdin\n");
                                        return(1);
                                }
 #if !defined(HAVE_PIPE2) || O_CLOEXEC == 0
@@ -721,7 +723,7 @@ main(int argc, char *argv[])
        if ((remove(control_usock) != 0 && errno != ENOENT) ||
                (remove(mapi_usock) != 0 && errno != ENOENT)) {
                /* cannot remove socket files */
-               Mfprintf(stderr, "cannot remove socket files\n");
+               Mfprintf(stderr, "cannot remove socket files: %s\n", 
strerror(errno));
                MERO_EXIT_CLEAN(1);
        }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list