View | Details | Raw Unified | Return to bug 65313
Collapse All | Expand All

(-)server/mpm/event/event.c (-2 / +12 lines)
Lines 2866-2871 static void child_main(int child_num_arg, int chil Link Here
2866
2866
2867
    ap_run_child_init(pchild, ap_server_conf);
2867
    ap_run_child_init(pchild, ap_server_conf);
2868
2868
2869
    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00000)
2870
                 "Child %i initialization done (generation %i)",
2871
                 ap_my_pid, retained->mpm->my_generation);
2872
2869
    if (ap_max_requests_per_child) {
2873
    if (ap_max_requests_per_child) {
2870
        conns_this_child = ap_max_requests_per_child;
2874
        conns_this_child = ap_max_requests_per_child;
2871
    }
2875
    }
Lines 3407-3412 static int event_run(apr_pool_t * _pconf, apr_pool Link Here
3407
    }
3411
    }
3408
    else {
3412
    else {
3409
        if (retained->mpm->was_graceful) {
3413
        if (retained->mpm->was_graceful) {
3414
            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(99999)
3415
                         "Gracefully stopping old generation %i",
3416
                         retained->mpm->my_generation);
3410
            /* wake up the children...time to die.  But we'll have more soon */
3417
            /* wake up the children...time to die.  But we'll have more soon */
3411
            for (i = 0; i < num_buckets; i++) {
3418
            for (i = 0; i < num_buckets; i++) {
3412
                ap_mpm_podx_killpg(retained->buckets[i].pod,
3419
                ap_mpm_podx_killpg(retained->buckets[i].pod,
Lines 3414-3419 static int event_run(apr_pool_t * _pconf, apr_pool Link Here
3414
            }
3421
            }
3415
        }
3422
        }
3416
        else {
3423
        else {
3424
            ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(99999)
3425
                         "Ungracefully stopping old generation %i",
3426
                         retained->mpm->my_generation);
3417
            /* Kill 'em all.  Since the child acts the same on the parents SIGTERM
3427
            /* Kill 'em all.  Since the child acts the same on the parents SIGTERM
3418
             * and a SIGHUP, we may as well use the same signal, because some user
3428
             * and a SIGHUP, we may as well use the same signal, because some user
3419
             * pthreads are stealing signals from us left and right.
3429
             * pthreads are stealing signals from us left and right.
Lines 3548-3555 static int event_run(apr_pool_t * _pconf, apr_pool Link Here
3548
    }
3558
    }
3549
3559
3550
    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00489)
3560
    ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, ap_server_conf, APLOGNO(00489)
3551
                 "%s configured -- resuming normal operations",
3561
                 "%s configured -- resuming normal operations (generation %i)",
3552
                 ap_get_server_description());
3562
                 ap_get_server_description(), retained->mpm->my_generation);
3553
    ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00490)
3563
    ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf, APLOGNO(00490)
3554
                 "Server built: %s", ap_get_server_built());
3564
                 "Server built: %s", ap_get_server_built());
3555
    ap_log_command_line(plog, s);
3565
    ap_log_command_line(plog, s);

Return to bug 65313