logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

erlang-add-epmd-pid-file-creation-for-openrc.patch (2359B)

    

  1. From 04ace92c33a699f75445dc99c30d521311aba826 Mon Sep 17 00:00:00 2001

  2. From: Steve Arnold <nerdboy@gentoo.org>

  3. Date: Mon, 6 Aug 2018 16:38:30 -0700

  4. Subject: [PATCH] Add daemon-mode pid file creation when not configured for

  5.  systemd

  6. 

  7. Signed-off-by: Steve Arnold <nerdboy@gentoo.org>

  8. ---

  9.  erts/epmd/src/epmd.c | 39 ++++++++++++++++++++++++++++++++++++++-

  10.  erts/epmd/src/epmd.h |  3 +++

  11.  2 files changed, 41 insertions(+), 1 deletion(-)

  12. 

  13. diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c

  14. index 44e997e609..c74888a1ee 100644

  15. --- a/erts/epmd/src/epmd.c

  16. +++ b/erts/epmd/src/epmd.c

  17. @@ -40,6 +40,37 @@ static int check_relaxed(void);

  18.  #ifdef __WIN32__

  19.  static int has_console(void);

  20.  #endif

  21. +#ifndef HAVE_SYSTEMD_DAEMON

  22. +static int create_pidfile(void);

  23. +static const char *pidfile = EPMD_PIDFILE;

  24. +#endif

  25. +

  26. +#ifndef HAVE_SYSTEMD_DAEMON

  27. +static int create_pidfile(void)

  28. +{

  29. +    int fd;

  30. +

  31. +    unlink(pidfile);

  32. +

  33. +    /* open the pidfile */

  34. +    fd = open(pidfile, O_WRONLY|O_CREAT|O_EXCL, 0644);

  35. +    if (fd >= 0) {

  36. +        FILE *f;

  37. +

  38. +        /* write our pid to it */

  39. +        f = fdopen(fd, "w");

  40. +        if (f != NULL) {

  41. +            fprintf(f, "%d\n", getpid());

  42. +            fclose(f);

  43. +            /* leave the fd open */

  44. +            return 0;

  45. +        }

  46. +        close(fd);

  47. +    }

  48. +

  49. +    return -1;

  50. +}

  51. +#endif    /* (no) HAVE_SYSTEMD_DAEMON */

  52.  

  53.  #ifdef DONT_USE_MAIN

  54.  

  55. @@ -340,6 +371,13 @@ static void run_daemon(EpmdVars *g)

  56.      

  57.      umask(0);

  58.  

  59. +#ifndef HAVE_SYSTEMD_DAEMON

  60. +    if (create_pidfile() < 0) {

  61. +        dbg_perror(g,"could not create pidfile %s", pidfile);

  62. +        epmd_cleanup_exit(g,1);

  63. +    }

  64. +#endif /* HAVE_SYSTEMD_DAEMON */

  65. +

  66.      for (fd = 0; fd < g->max_conn ; fd++) /* close all files ... */

  67.          close(fd);

  68.      /* Syslog on linux will try to write to whatever if we dont

  69. @@ -614,4 +652,3 @@ static int check_relaxed(void)

  70.      char* port_str = getenv("ERL_EPMD_RELAXED_COMMAND_CHECK");

  71.      return (port_str != NULL) ? 1 : 0;

  72.  }

  73. -

  74. diff --git a/erts/epmd/src/epmd.h b/erts/epmd/src/epmd.h

  75. index cffcd4ae7a..e53322acf5 100644

  76. --- a/erts/epmd/src/epmd.h

  77. +++ b/erts/epmd/src/epmd.h

  78. @@ -20,6 +20,9 @@

  79.  

  80.  /* The port number is defined in a makefile */

  81.  

  82. +/* The name and path to the pid file */

  83. +#define EPMD_PIDFILE "/var/run/epmd.pid"

  84. +

  85.  /* Definitions of message codes */

  86.  

  87.  /* Registration and queries */

  88. -- 

  89. 2.17.0

  90.