Deleted
Added
nxt_runtime.c (231:6832cdee961e) | nxt_runtime.c (232:43f9808200cd) |
---|---|
1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) Valentin V. Bartenev 5 * Copyright (C) NGINX, Inc. 6 */ 7 8#include <nxt_main.h> --- 685 unchanged lines hidden (view full) --- 694 nxt_file_t *file; 695 nxt_file_name_str_t file_name; 696 const nxt_event_interface_t *interface; 697 698 rt->daemon = 1; 699 rt->master_process = 1; 700 rt->engine_connections = 256; 701 rt->auxiliary_threads = 2; | 1 2/* 3 * Copyright (C) Igor Sysoev 4 * Copyright (C) Valentin V. Bartenev 5 * Copyright (C) NGINX, Inc. 6 */ 7 8#include <nxt_main.h> --- 685 unchanged lines hidden (view full) --- 694 nxt_file_t *file; 695 nxt_file_name_str_t file_name; 696 const nxt_event_interface_t *interface; 697 698 rt->daemon = 1; 699 rt->master_process = 1; 700 rt->engine_connections = 256; 701 rt->auxiliary_threads = 2; |
702 rt->user_cred.user = "nobody"; 703 rt->group = NULL; | 702 rt->user_cred.user = NXT_USER; 703 rt->group = NXT_GROUP; |
704 rt->pid = NXT_PID; 705 rt->log = NXT_LOG; 706 707 if (nxt_runtime_conf_read_cmd(task, rt) != NXT_OK) { 708 return NXT_ERROR; 709 } 710 711 if (nxt_runtime_controller_socket(task, rt) != NXT_OK) { --- 40 unchanged lines hidden (view full) --- 752 nxt_str_t addr; 753 nxt_sockaddr_t *sa; 754 u_char buf[1024]; 755 756 static const char version[] = 757 "nginext version: " NXT_VERSION "\n" 758 "configured as ./configure" NXT_CONFIGURE_OPTIONS "\n"; 759 | 704 rt->pid = NXT_PID; 705 rt->log = NXT_LOG; 706 707 if (nxt_runtime_conf_read_cmd(task, rt) != NXT_OK) { 708 return NXT_ERROR; 709 } 710 711 if (nxt_runtime_controller_socket(task, rt) != NXT_OK) { --- 40 unchanged lines hidden (view full) --- 752 nxt_str_t addr; 753 nxt_sockaddr_t *sa; 754 u_char buf[1024]; 755 756 static const char version[] = 757 "nginext version: " NXT_VERSION "\n" 758 "configured as ./configure" NXT_CONFIGURE_OPTIONS "\n"; 759 |
760 static const char no_user[] = "option \"--user\" requires username\n"; 761 static const char no_group[] = "option \"--group\" requires group name\n"; |
|
760 static const char no_pid[] = "option \"--pid\" requires filename\n"; 761 static const char no_log[] = "option \"--log\" requires filename\n"; 762 763 argv = &nxt_process_argv[1]; 764 765 while (*argv != NULL) { 766 p = *argv++; 767 --- 32 unchanged lines hidden (view full) --- 800 rt->upstream.length = nxt_strlen(p); 801 rt->upstream.start = (u_char *) p; 802 803 continue; 804 } 805 806 if (nxt_strcmp(p, "--user") == 0) { 807 if (*argv == NULL) { | 762 static const char no_pid[] = "option \"--pid\" requires filename\n"; 763 static const char no_log[] = "option \"--log\" requires filename\n"; 764 765 argv = &nxt_process_argv[1]; 766 767 while (*argv != NULL) { 768 p = *argv++; 769 --- 32 unchanged lines hidden (view full) --- 802 rt->upstream.length = nxt_strlen(p); 803 rt->upstream.start = (u_char *) p; 804 805 continue; 806 } 807 808 if (nxt_strcmp(p, "--user") == 0) { 809 if (*argv == NULL) { |
808 nxt_log(task, NXT_LOG_CRIT, 809 "no argument for option \"--user\""); | 810 write(STDERR_FILENO, no_user, sizeof(no_user) - 1); |
810 return NXT_ERROR; 811 } 812 813 p = *argv++; 814 815 rt->user_cred.user = p; 816 817 continue; 818 } 819 820 if (nxt_strcmp(p, "--group") == 0) { 821 if (*argv == NULL) { | 811 return NXT_ERROR; 812 } 813 814 p = *argv++; 815 816 rt->user_cred.user = p; 817 818 continue; 819 } 820 821 if (nxt_strcmp(p, "--group") == 0) { 822 if (*argv == NULL) { |
822 nxt_log(task, NXT_LOG_CRIT, 823 "no argument for option \"--group\""); | 823 write(STDERR_FILENO, no_group, sizeof(no_group) - 1); |
824 return NXT_ERROR; 825 } 826 827 p = *argv++; 828 829 rt->group = p; 830 831 continue; --- 904 unchanged lines hidden --- | 824 return NXT_ERROR; 825 } 826 827 p = *argv++; 828 829 rt->group = p; 830 831 continue; --- 904 unchanged lines hidden --- |