aboutsummaryrefslogtreecommitdiffstats
path: root/erts/epmd/src/epmd.c
diff options
context:
space:
mode:
authorMatwey V. Kornilov <[email protected]>2013-12-17 18:16:56 +0400
committerMatwey V. Kornilov <[email protected]>2014-02-19 15:33:36 +0400
commitb7c95eabf6017ddb352fb8ce2b3749af108ebf29 (patch)
treeb74548225eda68455bc5ab0d6d982832cc411dce /erts/epmd/src/epmd.c
parent25237481ccccd3ddfa74582dc267632ad618ba30 (diff)
downloadotp-b7c95eabf6017ddb352fb8ce2b3749af108ebf29.tar.gz
otp-b7c95eabf6017ddb352fb8ce2b3749af108ebf29.tar.bz2
otp-b7c95eabf6017ddb352fb8ce2b3749af108ebf29.zip
Add systemd socket activation for epmd.
Check for systemd libraries and headers in confgiure. Add -systemd option enabling waiting for sockets from systemd.
Diffstat (limited to 'erts/epmd/src/epmd.c')
-rw-r--r--erts/epmd/src/epmd.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index 2d55b37ff3..fc58882907 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -175,6 +175,9 @@ int main(int argc, char** argv)
g->nodes.reg = g->nodes.unreg = g->nodes.unreg_tail = NULL;
g->nodes.unreg_count = 0;
g->active_conn = 0;
+#ifdef HAVE_SYSTEMD_SD_DAEMON_H
+ g->is_systemd = 0;
+#endif
for (i = 0; i < MAX_LISTEN_SOCKETS; i++)
g->listenfd[i] = -1;
@@ -248,8 +251,12 @@ int main(int argc, char** argv)
else
usage(g);
epmd_cleanup_exit(g,0);
- }
- else
+#ifdef HAVE_SYSTEMD_SD_DAEMON_H
+ } else if (strcmp(argv[0], "-systemd") == 0) {
+ g->is_systemd = 1;
+ argv++; argc--;
+#endif
+ } else
usage(g);
}
dbg_printf(g,1,"epmd running - daemon = %d",g->is_daemon);
@@ -454,6 +461,11 @@ static void usage(EpmdVars *g)
fprintf(stderr, " Forcibly unregisters a name with epmd\n");
fprintf(stderr, " (only allowed if -relaxed_command_check was given when \n");
fprintf(stderr, " epmd was started).\n");
+#ifdef HAVE_SYSTEMD_SD_DAEMON_H
+ fprintf(stderr, " -systemd\n");
+ fprintf(stderr, " Wait for socket from systemd. The option makes sense\n");
+ fprintf(stderr, " when started from .socket unit.\n");
+#endif
epmd_cleanup_exit(g,1);
}