MonetDB: Jun2016 - Really kill monetdbd when we're done waiting,...

[Sjoerd Mullender]

Changeset: 1024269b8b67 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1024269b8b67
Modified Files:
        tools/merovingian/daemon/argvcmds.c
        tools/merovingian/daemon/monetdbd.service.in
Branch: Jun2016
Log Message:

Really kill monetdbd when we're done waiting, also enable stop from systemctl.


diffs (26 lines):

diff --git a/tools/merovingian/daemon/argvcmds.c 
b/tools/merovingian/daemon/argvcmds.c
--- a/tools/merovingian/daemon/argvcmds.c
+++ b/tools/merovingian/daemon/argvcmds.c
@@ -508,6 +508,10 @@ command_stop(confkeyval *ckv, int argc, 
                select(0, NULL, NULL, NULL, &tv);
                if (kill(daemon, 0) == -1)
                        break;
+               if (i == 9) {
+                       /* done waiting, use harsher measures */
+                       kill(daemon, SIGKILL);
+               }
        }
 
        return(0);
diff --git a/tools/merovingian/daemon/monetdbd.service.in 
b/tools/merovingian/daemon/monetdbd.service.in
--- a/tools/merovingian/daemon/monetdbd.service.in
+++ b/tools/merovingian/daemon/monetdbd.service.in
@@ -8,7 +8,7 @@ Type=forking
 User=monetdb
 Group=monetdb
 ExecStart=@Ebindir@/monetdbd start @Elocalstatedir@/monetdb5/dbfarm
-# no ExecStop since "monetdbd stop ..." is asynchronous
+ExecStop=@Ebindir@/monetdbd stop @Elocalstatedir@/monetdb5/dbfarm
 Restart=on-failure
 PIDFile=@Erundir@/merovingian.pid
 PrivateDevices=yes
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list