Changeset 1410:4ddd4dcd6bb6 in freeDiameter

Timestamp:

Feb 18, 2020, 3:21:07 PM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

committer:

Luke Mewburn <luke@mewburn.net> 1582007256 -39600

Message:

freeDiameterd: add pidfile support

Implement -p filename / --pidfile=filename to write
the pidfile to filename after daemonisation

File:

• freeDiameterd/main.c (modified) (7 diffs)

freeDiameterd/main.c

@@ -46 +46 @@
 #include <syslog.h>
 #include <stdarg.h>
+#include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
@@ -57 +59 @@
 static int daemon_mode = 0;
 static int gnutls_debug = 0;
+static char *pidfile = NULL;
 
 /* gnutls debug */
 static void fd_gnutls_debug(int level, const char * str) {
         fd_log_debug(" [gnutls:%d] %s", level, str);
+}
+
+static void pidfile_cleanup(void)
+{
+        if (pidfile != NULL) {
+                LOG_I("Removing pidfile '%s'", pidfile);
+                CHECK_SYS_DO( unlink(pidfile), /* ignore */ );
+                pidfile = NULL;
+        }
+}
+
+static int pidfile_create(void)
+{
+        if (pidfile == NULL) {
+                return 0;
+        }
+
+        /* Create pidfile */
+        FILE * fp = fopen(pidfile, "w");
+        if (fp == NULL) {
+                int ret = errno;
+                LOG_F("Unable to write pidfile '%s'; Error: %s",
+                        pidfile, strerror(ret));
+                pidfile = NULL; /* disable pidfile_cleanup() */
+                return ret;
+        }
+
+        /* Cleaup pidfile on exit */
+        if (atexit(pidfile_cleanup) != 0) {
+                LOG_F("Unable to setup pidfile cleanup");
+                CHECK_SYS( fclose(fp) );
+                pidfile_cleanup();
+                return EINVAL;
+        }
+
+        /* Write the pid and close pidfile */
+        fprintf(fp, "%d\n", getpid());
+        CHECK_SYS_DO( fclose(fp), { pidfile_cleanup(); return __ret__; } );
+
+        LOG_I("Created pidfile '%s'", pidfile);
+        return 0;
 }
 
@@ -119 +163 @@
         }
 
+        CHECK_FCT( pidfile_create() );
+
         /* Initialize the core library */
         ret = fd_core_initialize();
@@ -186 +232 @@
                 "                          default location (" DEFAULT_CONF_PATH "/" FD_DEFAULT_CONF_FILENAME ")\n"
                 "  -D, --daemon            Start program in background\n"
+                "  -p, --pidfile=filename  Write PID to filename\n"
                 "  -s, --syslog            Write log output to syslog (instead of stdout)\n");
         printf( "\nDebug:\n"
@@ -211 +258 @@
                 { "syslog",     no_argument,            NULL, 's' },
                 { "daemon",     no_argument,            NULL, 'D' },
+                { "pidfile",    required_argument,      NULL, 'p' },
                 { "debug",      no_argument,            NULL, 'd' },
                 { "quiet",      no_argument,            NULL, 'q' },
@@ -222 +270 @@
         /* Loop on arguments */
         while (1) {
-                c = getopt_long (argc, argv, "hVc:Ddql:f:F:g:s", long_options, &option_index);
+                c = getopt_long (argc, argv, "hVc:Dp:dql:f:F:g:s", long_options, &option_index);
                 if (c == -1)
                         break;  /* Exit from the loop.  */
@@ -245 +293 @@
                         case 'D':
                                 daemon_mode = 1;
+                                break;
+
+                        case 'p':       /* Write pidfile */
+                                if (optarg == NULL ) {
+                                        fprintf(stderr, "Missing argument with --pidfile directive\n");
+                                        return EINVAL;
+                                }
+                                pidfile = optarg;
                                 break;