- Fixed bug #63085 (Systemd integration and daemonize)

diff --git a/NEWS b/NEWS
index 354353ff724e6058bc7b7e4feb11121f58e31caf..4e9f98dbe3ae67d236202e743b99c6191c88af4d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ PHP                                                                        NEWS
 - FPM:
   . Fixed bug #62954 (startup problems fpm / php-fpm). (fat)
   . Fixed bug #62886 (PHP-FPM may segfault/hang on startup). (fat)
+  . Fixed bug #63085 (Systemd integration and daemonize). (remi, fat)
 
 - Intl:
   . Fix bug #62915 (defective cloning in several intl classes). (Gustavo)

diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index c23485a3427d8118982e8256abe541f02078cfee..768766056e01e11df2a5537e1990bc5821063984 100644 (file)
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -583,7 +583,7 @@ if test "$PHP_FPM" != "no"; then
   AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
   AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])
 
-  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.8 sapi/fpm/status.html)
+  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
   PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag], [$abs_srcdir/sapi/fpm], [sapi/fpm])
 
   SAPI_FPM_PATH=sapi/fpm/php-fpm

diff --git a/sapi/fpm/fpm/fpm.c b/sapi/fpm/fpm/fpm.c
index 2f42175d894f4923afaaa9e455a4c40a7e125ef0..b866f37f2d1778f80ab26cfc97a02b7947e3a604 100644 (file)
--- a/sapi/fpm/fpm/fpm.c
+++ b/sapi/fpm/fpm/fpm.c
@@ -42,7 +42,7 @@ struct fpm_globals_s fpm_globals = {
        .send_config_pipe = {0, 0},
 };
 
-int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int test_conf, int run_as_root) /* {{{ */
+int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int test_conf, int run_as_root, int force_daemon) /* {{{ */
 {
        fpm_globals.argc = argc;
        fpm_globals.argv = argv;
@@ -55,7 +55,7 @@ int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int t
 
        if (0 > fpm_php_init_main()           ||
            0 > fpm_stdio_init_main()         ||
-           0 > fpm_conf_init_main(test_conf) ||
+           0 > fpm_conf_init_main(test_conf, force_daemon) ||
            0 > fpm_unix_init_main()          ||
            0 > fpm_scoreboard_init_main()    ||
            0 > fpm_pctl_init_main()          ||

diff --git a/sapi/fpm/fpm/fpm.h b/sapi/fpm/fpm/fpm.h
index c576876386fafa4cf9ba26fae8208680a845817c..65d0e0d69127e15aecff30d170195b99eff2583a 100644 (file)
--- a/sapi/fpm/fpm/fpm.h
+++ b/sapi/fpm/fpm/fpm.h
@@ -37,7 +37,7 @@
 
 
 int fpm_run(int *max_requests);
-int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int test_conf, int run_as_root);
+int fpm_init(int argc, char **argv, char *config, char *prefix, char *pid, int test_conf, int run_as_root, int force_daemon);
 
 struct fpm_globals_s {
        pid_t parent_pid;

diff --git a/sapi/fpm/fpm/fpm_conf.c b/sapi/fpm/fpm/fpm_conf.c
index dfe6792c058b7b2a2e2f4c33c9765c6bf5d52bce..25e2cc43a12ef1cc10881f16dc950475a221c6b9 100644 (file)
--- a/sapi/fpm/fpm/fpm_conf.c
+++ b/sapi/fpm/fpm/fpm_conf.c
@@ -1115,7 +1115,7 @@ int fpm_conf_write_pid() /* {{{ */
 }
 /* }}} */
 
-static int fpm_conf_post_process(TSRMLS_D) /* {{{ */
+static int fpm_conf_post_process(int force_daemon TSRMLS_DC) /* {{{ */
 {
        struct fpm_worker_pool_s *wp;
 
@@ -1123,6 +1123,11 @@ static int fpm_conf_post_process(TSRMLS_D) /* {{{ */
                fpm_evaluate_full_path(&fpm_global_config.pid_file, NULL, PHP_LOCALSTATEDIR, 0);
        }
 
+       if (force_daemon >= 0) {
+               /* forced from command line options */
+               fpm_global_config.daemonize = force_daemon;
+       }
+
        fpm_globals.log_level = fpm_global_config.log_level;
 
        if (fpm_global_config.process_max < 0) {
@@ -1584,7 +1589,7 @@ static void fpm_conf_dump() /* {{{ */
 }
 /* }}} */
 
-int fpm_conf_init_main(int test_conf) /* {{{ */
+int fpm_conf_init_main(int test_conf, int force_daemon) /* {{{ */
 {
        int ret;
        TSRMLS_FETCH();
@@ -1630,7 +1635,7 @@ int fpm_conf_init_main(int test_conf) /* {{{ */
                return -1;
        }
 
-       if (0 > fpm_conf_post_process(TSRMLS_C)) {
+       if (0 > fpm_conf_post_process(force_daemon TSRMLS_CC)) {
                zlog(ZLOG_ERROR, "failed to post process the configuration");
                return -1;
        }

diff --git a/sapi/fpm/fpm/fpm_conf.h b/sapi/fpm/fpm/fpm_conf.h
index f780f038915d914978d9d8f263132e65ce33c715..dc54133d431008e2649ab1fad57fb085bb79c333 100644 (file)
--- a/sapi/fpm/fpm/fpm_conf.h
+++ b/sapi/fpm/fpm/fpm_conf.h
@@ -97,7 +97,7 @@ enum {
        PM_STYLE_ONDEMAND = 3
 };
 
-int fpm_conf_init_main(int test_conf);
+int fpm_conf_init_main(int test_conf, int force_daemon);
 int fpm_worker_pool_config_free(struct fpm_worker_pool_config_s *wpc);
 int fpm_conf_write_pid();
 int fpm_conf_unlink_pid();

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 70e917a07fe42af346d23422eee0cf30fac20783..3faf30866727c36c54b78fc7ae0dc5d72202d4d8 100644 (file)
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -155,6 +155,8 @@ static const opt_struct OPTIONS[] = {
        {'p', 1, "prefix"},
        {'g', 1, "pid"},
        {'R', 0, "allow-to-run-as-root"},
+       {'D', 0, "daemonize"},
+       {'F', 0, "nodaemonize"},
        {'-', 0, NULL} /* end of args */
 };
 
@@ -921,7 +923,7 @@ static void php_cgi_usage(char *argv0)
                prog = "php";
        }
 
-       php_printf(     "Usage: %s [-n] [-e] [-h] [-i] [-m] [-v] [-t] [-p <prefix>] [-g <pid>] [-c <file>] [-d foo[=bar]] [-y <file>]\n"
+       php_printf(     "Usage: %s [-n] [-e] [-h] [-i] [-m] [-v] [-t] [-p <prefix>] [-g <pid>] [-c <file>] [-d foo[=bar]] [-y <file>] [-D] [-F]\n"
                                "  -c <path>|<file> Look for php.ini file in this directory\n"
                                "  -n               No php.ini file will be used\n"
                                "  -d foo[=bar]     Define INI entry foo with value 'bar'\n"
@@ -937,6 +939,9 @@ static void php_cgi_usage(char *argv0)
                                "  -y, --fpm-config <file>\n"
                                "                   Specify alternative path to FastCGI process manager config file.\n"
                                "  -t, --test       Test FPM configuration and exit\n"
+                               "  -D, --daemonize  force to run in background, and ignore daemonize option from config file\n"
+                               "  -F, --nodaemonize\n"
+                               "                   force to stay in foreground, and ignore daemonize option from config file\n"
                                "  -R, --allow-to-run-as-root\n"
                                "                   Allow pool to run as root (disabled by default)\n",
 
@@ -1560,6 +1565,7 @@ int main(int argc, char *argv[])
        char *fpm_prefix = NULL;
        char *fpm_pid = NULL;
        int test_conf = 0;
+       int force_daemon = -1;
        int php_information = 0;
        int php_allow_to_run_as_root = 0;
 
@@ -1679,6 +1685,14 @@ int main(int argc, char *argv[])
                                php_allow_to_run_as_root = 1;
                                break;
 
+                       case 'D': /* daemonize */
+                               force_daemon = 1;
+                               break;
+
+                       case 'F': /* nodaemonize */
+                               force_daemon = 0;
+                               break;
+
                        default:
                        case 'h':
                        case '?':
@@ -1802,7 +1816,7 @@ consult the installation file that came with this distribution, or visit \n\
                }
        }
 
-       if (0 > fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_config), fpm_prefix, fpm_pid, test_conf, php_allow_to_run_as_root)) {
+       if (0 > fpm_init(argc, argv, fpm_config ? fpm_config : CGIG(fpm_config), fpm_prefix, fpm_pid, test_conf, php_allow_to_run_as_root, force_daemon)) {
 
                if (fpm_globals.send_config_pipe[1]) {
                        int writeval = 0;

diff --git a/sapi/fpm/init.d.php-fpm.in b/sapi/fpm/init.d.php-fpm.in
index dc66310c3dcc0f20b11a5899371b75176b4f2537..3edd64fe19ec8741be13cd1fff8ab78db7ebcb45 100644 (file)
--- a/sapi/fpm/init.d.php-fpm.in
+++ b/sapi/fpm/init.d.php-fpm.in
@@ -54,7 +54,7 @@ case "$1" in
        start)
                echo -n "Starting php-fpm "
 
-               $php_fpm_BIN $php_opts
+               $php_fpm_BIN --daemonize $php_opts
 
                if [ "$?" != 0 ] ; then
                        echo " failed"

diff --git a/sapi/fpm/php-fpm.8.in b/sapi/fpm/php-fpm.8.in
index 6c9c6d6274b3efb885309049a2d58560f1018060..a4e7e74e208d8a19a16945f0f002f93004774d46 100644 (file)
--- a/sapi/fpm/php-fpm.8.in
+++ b/sapi/fpm/php-fpm.8.in
@@ -99,6 +99,20 @@ Test FPM configuration file and exit
 If called twice (-tt), the configuration is dumped before exiting.
 .TP
 .PD 0
+.B \-\-daemonize
+.TP
+.PD 1
+.B \-D
+Force to run in background and ignore daemonize option from configuration file.
+.TP
+.PD 0
+.B \-\-nodaemonize
+.TP
+.PD 1
+.B \-F
+Force to stay in foreground and ignore daemonize option from configuration file.
+.TP
+.PD 0
 .B \-\-zend\-extension \fIfile\fP
 .TP
 .PD 1
@@ -113,13 +127,20 @@ The configuration file for the php-fpm daemon.
 .B php.ini
 The standard php configuration file.
 .SH EXAMPLES
-You should use the init script provided to start and stop the php-fpm daemon. This situation applies for any unix systems which use init.d for their main process manager.
+For any unix systems which use init.d for their main process manager, you should use the init script provided to start and stop the php-fpm daemon.
 .P
 .PD 1
 .RS
 sudo /etc/init.d/php-fpm start
 .RE
 .TP
+For any unix systems which use systemd for their main process manager, you should use the unit file provided to start and stop the php-fpm daemon.
+.P
+.PD 1
+.RS
+sudo systemctl start php-fpm.service
+.RE
+.TP
 If your installation has no appropriate init script, launch php-fpm with no arguments. It will launch as a daemon (background process) by default. The file @php_fpm_localstatedir@/run/php-fpm.pid determines whether php-fpm is already up and running. Once started, php-fpm then responds to several POSIX signals:
 .P
 .PD 0