Merge pull request #132 from garlick/logging

enable systemctl reload diod + minor logging improvements

Author: mergify[bot]

etc/diod.service.in

@@ -4,6 +4,7 @@ Description=9P File Server
 [Service]
 Type=exec
 ExecStart=@X_SBINDIR@/diod
+ExecReload=kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target

src/cmd/diod.c

@@ -121,7 +121,7 @@ main(int argc, char **argv)
     srvmode_t mode = SRV_NORMAL;
     int rfdno = -1, wfdno = -1;
 
-    diod_log_init (argv[0]);
+    diod_log_init (NULL);
     diod_conf_init ();
 
     /* config file overrides defaults */

src/libdiod/diod_log.c

@@ -26,15 +26,27 @@
 
 #include "diod_log.h"
 
-static char *prog = NULL;
-
+static char log_prefix[32] = { 0 };
 static char *filename = NULL;
 static FILE *logf = NULL;
 
+/* If 'path' is a program path, prefix is "name: ", where name is basename (path).
+ * If 'path' ends in a space, omit the ": ", e.g. path of "# " is used verbatim.
+ * If 'path' is NULL, there is no log prefix.
+ */
 void
-diod_log_init (char *p)
+diod_log_init (char *path)
 {
-    prog = basename (p);
+    if (path) {
+        char *cp = strrchr (path, '/');
+        snprintf (log_prefix,
+                  sizeof (log_prefix),
+                  "%s%s",
+                  cp ? cp + 1 : path,
+                  isspace (path[strlen (path) - 1]) ? "" : ": ");
+    }
+    else
+        log_prefix[0] = '\0';
     logf = stderr;
 }
 
@@ -93,7 +105,7 @@ _verr (int errnum, const char *fmt, va_list ap)
         char *s = strerror_r (errnum, errbuf, sizeof (errbuf)); /* GNU version */
 #endif
         vsnprintf (buf, sizeof (buf), fmt, ap);  /* ignore overflow */
-        fprintf (logf, "%s: %s: %s\n", prog, buf, s);
+        fprintf (logf, "%s%s: %s\n", log_prefix, buf, s);
         fflush (logf);
     }
 }
@@ -105,7 +117,7 @@ diod_log_msg (const char *fmt, va_list ap)
 
     if (logf) {
         vsnprintf (buf, sizeof (buf), fmt, ap);  /* ignore overflow */
-        fprintf (logf, "%s: %s\n", prog, buf);
+        fprintf (logf, "%s%s\n", log_prefix, buf);
         fflush (logf);
     }
 }

src/libdiod/diod_rdma.c

@@ -23,6 +23,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/signal.h>
 #include <sys/param.h>
@@ -103,6 +104,10 @@ diod_rdma_listen (diod_rdma_t rdma)
     if (n)
         errn (n, "rdma_listen");
 
+    msg ("Listening on rdma %s:%d",
+         inet_ntoa (rdma->addr.sin_addr),
+         rdma_port);
+
     return 0;
 }
 

src/libdiod/diod_sock.c

@@ -177,6 +177,8 @@ _setup_one_inet (char *host, char *port, struct pollfd **fdsp, int *nfdsp)
             break;
         count++;
     }
+    if (count > 0)
+        msg ("Listening on %s:%s", host, port);
 done:
     if (res)
         freeaddrinfo (res);
@@ -211,6 +213,7 @@ _setup_one_unix (char *path, struct pollfd **fdsp, int *nfdsp)
     }
     if (_poll_add (fdsp, nfdsp, fd) < 0)
         goto error;
+    msg ("Listening on %s", path);
     return 1;
 error:
     if (fd != -1)

src/libtest/server.c

@@ -29,7 +29,7 @@ Npsrv *test_server_create (const char *testdir, int flags, int *client_fd)
     int s[2];
     Npsrv *srv;
 
-    diod_log_init ("#"); // add TAP compatible prefix on stderr logs
+    diod_log_init ("# "); // add TAP compatible prefix on stderr logs
     diod_conf_init ();
     diod_conf_set_auth_required (0);
 

tests/misc/Makefile.am

@@ -8,24 +8,6 @@ TESTS_ENVIRONMENT += "TOP_BUILDDIR=$(top_builddir)"
 
 TESTS = t15
 
-CLEANFILES = *.out *.diff
+CLEANFILES = *.out *.diod
 
-AM_CFLAGS = @WARNING_CFLAGS@
-
-AM_CPPFLAGS = \
-        -I$(top_srcdir) \
-	$(LUA_INCLUDE)
-
-LDADD = $(top_builddir)/src/cmd/opt.o \
-	$(top_builddir)/src/daemon/ops.o \
-	$(top_builddir)/src/daemon/fid.o \
-	$(top_builddir)/src/daemon/exp.o \
-	$(top_builddir)/src/daemon/ioctx.o \
-	$(top_builddir)/src/daemon/xattr.o \
-	$(top_builddir)/src/libdiod/libdiod.a \
-	$(top_builddir)/src/libnpclient/libnpclient.a \
-	$(top_builddir)/src/libnpfs/libnpfs.a \
-	$(top_builddir)/src/liblsd/liblsd.a \
-	$(LIBPTHREAD) $(LUA_LIB) $(LIBMUNGE) $(LIBCAP) $(LIBTCMALLOC)
-
-EXTRA_DIST = $(TESTS) $(TESTS:%=%.exp) memcheck valgrind.supp
+EXTRA_DIST = $(TESTS) memcheck valgrind.supp

tests/misc/t15

@@ -12,7 +12,6 @@ bg_test ()
 TEST=$(basename $0 | cut -d- -f1)
 sockfile=$(mktemp)
 bg_test $sockfile &
-${MISC_SRCDIR}/memcheck ${TOP_BUILDDIR}/src/cmd/diod -c /dev/null -n -e ctl -l $sockfile -s >$TEST.out 2>&1
-diff ${MISC_SRCDIR}/$TEST.exp $TEST.out >$TEST.diff
+${MISC_SRCDIR}/memcheck ${TOP_BUILDDIR}/src/cmd/diod -L $TEST.diod -c /dev/null -n -e ctl -l $sockfile -s >$TEST.out 2>&1
 rm -f $sockfile
 wait %1