Mercurial > hg > nginx
annotate src/core/nginx.c @ 6257:5eb4d7541107
Extract out version info function.
The code for displaying version info and configuration info seemed to be
cluttering up the main function. I was finding it hard to read main. This
extracts out all of the logic for displaying version and configuration info
into its own function, thus making main easier to read.
| author | Kurtis Nusbaum <klnusbaum@gmail.com> |
|---|---|
| date | Sun, 12 Jul 2015 08:31:38 -0700 |
| parents | 1b7e246e6b38 |
| children | 7ac57369036c |
| rev | line source |
|---|---|
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
440
diff
changeset
|
1 |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
440
diff
changeset
|
2 /* |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
443
diff
changeset
|
3 * Copyright (C) Igor Sysoev |
| 4412 | 4 * Copyright (C) Nginx, Inc. |
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
440
diff
changeset
|
5 */ |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
440
diff
changeset
|
6 |
|
98
c9b243802a17
nginx-0.0.1-2003-05-30-18:27:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
97
diff
changeset
|
7 |
|
c9b243802a17
nginx-0.0.1-2003-05-30-18:27:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
97
diff
changeset
|
8 #include <ngx_config.h> |
|
c9b243802a17
nginx-0.0.1-2003-05-30-18:27:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
97
diff
changeset
|
9 #include <ngx_core.h> |
|
0
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
10 #include <nginx.h> |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
11 |
|
4eff17414a43
nginx-0.0.1-2002-08-06-20:39:45 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
12 |
|
6257
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
13 static void ngx_show_version_info(); |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
14 static ngx_int_t ngx_add_inherited_sockets(ngx_cycle_t *cycle); |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
15 static ngx_int_t ngx_get_options(int argc, char *const *argv); |
| 2758 | 16 static ngx_int_t ngx_process_options(ngx_cycle_t *cycle); |
| 452 | 17 static ngx_int_t ngx_save_argv(ngx_cycle_t *cycle, int argc, char *const *argv); |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
18 static void *ngx_core_module_create_conf(ngx_cycle_t *cycle); |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
19 static char *ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf); |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
20 static char *ngx_set_user(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
| 1069 | 21 static char *ngx_set_env(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
| 473 | 22 static char *ngx_set_priority(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |
| 577 | 23 static char *ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd, |
| 24 void *conf); | |
|
4890
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
25 static char *ngx_set_worker_processes(ngx_conf_t *cf, ngx_command_t *cmd, |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
26 void *conf); |
|
3
34a521b1a148
nginx-0.0.1-2002-08-20-18:48:28 import
Igor Sysoev <igor@sysoev.ru>
parents:
2
diff
changeset
|
27 |
|
117
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
28 |
| 461 | 29 static ngx_conf_enum_t ngx_debug_points[] = { |
| 30 { ngx_string("stop"), NGX_DEBUG_POINTS_STOP }, | |
| 31 { ngx_string("abort"), NGX_DEBUG_POINTS_ABORT }, | |
| 32 { ngx_null_string, 0 } | |
| 577 | 33 }; |
| 461 | 34 |
| 35 | |
|
117
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
36 static ngx_command_t ngx_core_commands[] = { |
|
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
37 |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
38 { ngx_string("daemon"), |
| 563 | 39 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_FLAG, |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
40 ngx_conf_set_flag_slot, |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
41 0, |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
42 offsetof(ngx_core_conf_t, daemon), |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
43 NULL }, |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
44 |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
45 { ngx_string("master_process"), |
| 563 | 46 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_FLAG, |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
47 ngx_conf_set_flag_slot, |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
48 0, |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
49 offsetof(ngx_core_conf_t, master), |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
50 NULL }, |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
51 |
| 563 | 52 { ngx_string("timer_resolution"), |
| 53 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | |
| 54 ngx_conf_set_msec_slot, | |
| 55 0, | |
| 56 offsetof(ngx_core_conf_t, timer_resolution), | |
| 57 NULL }, | |
| 58 | |
| 543 | 59 { ngx_string("pid"), |
| 60 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | |
| 61 ngx_conf_set_str_slot, | |
| 62 0, | |
| 63 offsetof(ngx_core_conf_t, pid), | |
| 64 NULL }, | |
| 65 | |
| 611 | 66 { ngx_string("lock_file"), |
| 67 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | |
| 68 ngx_conf_set_str_slot, | |
| 69 0, | |
| 70 offsetof(ngx_core_conf_t, lock_file), | |
| 71 NULL }, | |
| 72 | |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
73 { ngx_string("worker_processes"), |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
74 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, |
|
4890
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
75 ngx_set_worker_processes, |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
76 0, |
|
4890
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
77 0, |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
78 NULL }, |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
79 |
| 461 | 80 { ngx_string("debug_points"), |
| 81 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | |
| 82 ngx_conf_set_enum_slot, | |
| 83 0, | |
| 84 offsetof(ngx_core_conf_t, debug_points), | |
| 85 &ngx_debug_points }, | |
| 86 | |
| 543 | 87 { ngx_string("user"), |
| 88 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE12, | |
| 89 ngx_set_user, | |
| 90 0, | |
| 91 0, | |
| 92 NULL }, | |
| 93 | |
| 94 { ngx_string("worker_priority"), | |
| 95 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | |
| 96 ngx_set_priority, | |
| 97 0, | |
| 98 0, | |
| 99 NULL }, | |
| 100 | |
| 577 | 101 { ngx_string("worker_cpu_affinity"), |
| 102 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_1MORE, | |
| 103 ngx_set_cpu_affinity, | |
| 104 0, | |
| 105 0, | |
| 106 NULL }, | |
| 107 | |
| 543 | 108 { ngx_string("worker_rlimit_nofile"), |
| 109 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | |
| 110 ngx_conf_set_num_slot, | |
| 111 0, | |
| 112 offsetof(ngx_core_conf_t, rlimit_nofile), | |
| 113 NULL }, | |
| 114 | |
| 589 | 115 { ngx_string("worker_rlimit_core"), |
| 116 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | |
|
3762
89002ac695e5
worker_rlimit_core should be off_t
Igor Sysoev <igor@sysoev.ru>
parents:
3750
diff
changeset
|
117 ngx_conf_set_off_slot, |
| 589 | 118 0, |
| 119 offsetof(ngx_core_conf_t, rlimit_core), | |
| 120 NULL }, | |
| 121 | |
| 543 | 122 { ngx_string("working_directory"), |
| 123 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | |
| 124 ngx_conf_set_str_slot, | |
| 125 0, | |
| 126 offsetof(ngx_core_conf_t, working_directory), | |
| 127 NULL }, | |
| 128 | |
| 1069 | 129 { ngx_string("env"), |
| 130 NGX_MAIN_CONF|NGX_DIRECT_CONF|NGX_CONF_TAKE1, | |
| 131 ngx_set_env, | |
| 132 0, | |
| 133 0, | |
| 134 NULL }, | |
| 135 | |
|
209
e1c815be05ae
nginx-0.0.1-2003-12-09-18:08:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
207
diff
changeset
|
136 ngx_null_command |
|
117
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
137 }; |
|
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
138 |
|
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
139 |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
140 static ngx_core_module_t ngx_core_module_ctx = { |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
141 ngx_string("core"), |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
142 ngx_core_module_create_conf, |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
143 ngx_core_module_init_conf |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
144 }; |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
145 |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
146 |
|
117
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
147 ngx_module_t ngx_core_module = { |
| 509 | 148 NGX_MODULE_V1, |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
149 &ngx_core_module_ctx, /* module context */ |
|
117
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
150 ngx_core_commands, /* module directives */ |
|
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
151 NGX_CORE_MODULE, /* module type */ |
| 541 | 152 NULL, /* init master */ |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
153 NULL, /* init module */ |
| 541 | 154 NULL, /* init process */ |
| 155 NULL, /* init thread */ | |
| 156 NULL, /* exit thread */ | |
| 157 NULL, /* exit process */ | |
| 158 NULL, /* exit master */ | |
| 159 NGX_MODULE_V1_PADDING | |
|
117
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
160 }; |
|
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
161 |
|
f6e3c5d019b6
nginx-0.0.1-2003-07-11-19:17:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
115
diff
changeset
|
162 |
| 2725 | 163 ngx_uint_t ngx_max_module; |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
194
diff
changeset
|
164 |
| 2735 | 165 static ngx_uint_t ngx_show_help; |
| 2725 | 166 static ngx_uint_t ngx_show_version; |
| 167 static ngx_uint_t ngx_show_configure; | |
| 2758 | 168 static u_char *ngx_prefix; |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
169 static u_char *ngx_conf_file; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
170 static u_char *ngx_conf_params; |
| 2725 | 171 static char *ngx_signal; |
| 172 | |
| 639 | 173 |
| 1069 | 174 static char **ngx_os_environ; |
| 601 | 175 |
|
107
b5be4b0448d3
nginx-0.0.1-2003-07-01-19:00:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
106
diff
changeset
|
176 |
| 503 | 177 int ngx_cdecl |
| 499 | 178 main(int argc, char *const *argv) |
|
107
b5be4b0448d3
nginx-0.0.1-2003-07-01-19:00:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
106
diff
changeset
|
179 { |
|
6187
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
180 ngx_buf_t *b; |
| 452 | 181 ngx_log_t *log; |
|
6187
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
182 ngx_uint_t i; |
| 452 | 183 ngx_cycle_t *cycle, init_cycle; |
|
6187
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
184 ngx_conf_dump_t *cd; |
| 452 | 185 ngx_core_conf_t *ccf; |
|
107
b5be4b0448d3
nginx-0.0.1-2003-07-01-19:00:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
106
diff
changeset
|
186 |
|
4222
2dd6c7cb211a
FreeBSD's MALLOC_OPTIONS must be set before any malloc() call.
Igor Sysoev <igor@sysoev.ru>
parents:
3798
diff
changeset
|
187 ngx_debug_init(); |
|
2dd6c7cb211a
FreeBSD's MALLOC_OPTIONS must be set before any malloc() call.
Igor Sysoev <igor@sysoev.ru>
parents:
3798
diff
changeset
|
188 |
|
3798
61d64ab739a0
move ngx_strerror_init() at the very start
Igor Sysoev <igor@sysoev.ru>
parents:
3787
diff
changeset
|
189 if (ngx_strerror_init() != NGX_OK) { |
|
61d64ab739a0
move ngx_strerror_init() at the very start
Igor Sysoev <igor@sysoev.ru>
parents:
3787
diff
changeset
|
190 return 1; |
|
61d64ab739a0
move ngx_strerror_init() at the very start
Igor Sysoev <igor@sysoev.ru>
parents:
3787
diff
changeset
|
191 } |
|
61d64ab739a0
move ngx_strerror_init() at the very start
Igor Sysoev <igor@sysoev.ru>
parents:
3787
diff
changeset
|
192 |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
193 if (ngx_get_options(argc, argv) != NGX_OK) { |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
194 return 1; |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
195 } |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
196 |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
197 if (ngx_show_version) { |
|
6257
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
198 ngx_show_version_info(); |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
199 |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
200 if (!ngx_test_config) { |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
201 return 0; |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
202 } |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
203 } |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
204 |
|
108
adc093f880c8
nginx-0.0.1-2003-07-02-09:01:53 import
Igor Sysoev <igor@sysoev.ru>
parents:
107
diff
changeset
|
205 /* TODO */ ngx_max_sockets = -1; |
|
107
b5be4b0448d3
nginx-0.0.1-2003-07-01-19:00:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
106
diff
changeset
|
206 |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
194
diff
changeset
|
207 ngx_time_init(); |
|
221
401154e21826
nginx-0.0.1-2004-01-08-20:08:10 import
Igor Sysoev <igor@sysoev.ru>
parents:
220
diff
changeset
|
208 |
| 455 | 209 #if (NGX_PCRE) |
|
195
8dee38ea9117
nginx-0.0.1-2003-11-25-23:44:56 import
Igor Sysoev <igor@sysoev.ru>
parents:
194
diff
changeset
|
210 ngx_regex_init(); |
|
212
679f60139863
nginx-0.0.1-2003-12-19-11:15:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
210
diff
changeset
|
211 #endif |
|
182
3c49eaf3f522
nginx-0.0.1-2003-11-13-09:14:05 import
Igor Sysoev <igor@sysoev.ru>
parents:
144
diff
changeset
|
212 |
|
443
33aec431094b
nginx-0.1.0-2004-09-29-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
213 ngx_pid = ngx_getpid(); |
|
33aec431094b
nginx-0.1.0-2004-09-29-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
214 |
| 2758 | 215 log = ngx_log_init(ngx_prefix); |
| 501 | 216 if (log == NULL) { |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
443
diff
changeset
|
217 return 1; |
|
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
443
diff
changeset
|
218 } |
|
107
b5be4b0448d3
nginx-0.0.1-2003-07-01-19:00:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
106
diff
changeset
|
219 |
| 541 | 220 /* STUB */ |
|
393
5659d773cfa8
nginx-0.0.7-2004-07-15-20:35:51 import
Igor Sysoev <igor@sysoev.ru>
parents:
376
diff
changeset
|
221 #if (NGX_OPENSSL) |
|
5659d773cfa8
nginx-0.0.7-2004-07-15-20:35:51 import
Igor Sysoev <igor@sysoev.ru>
parents:
376
diff
changeset
|
222 ngx_ssl_init(log); |
|
5659d773cfa8
nginx-0.0.7-2004-07-15-20:35:51 import
Igor Sysoev <igor@sysoev.ru>
parents:
376
diff
changeset
|
223 #endif |
|
5659d773cfa8
nginx-0.0.7-2004-07-15-20:35:51 import
Igor Sysoev <igor@sysoev.ru>
parents:
376
diff
changeset
|
224 |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
225 /* |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
226 * init_cycle->log is required for signal handlers and |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
227 * ngx_process_options() |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
228 */ |
|
212
679f60139863
nginx-0.0.1-2003-12-19-11:15:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
210
diff
changeset
|
229 |
|
679f60139863
nginx-0.0.1-2003-12-19-11:15:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
210
diff
changeset
|
230 ngx_memzero(&init_cycle, sizeof(ngx_cycle_t)); |
|
679f60139863
nginx-0.0.1-2003-12-19-11:15:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
210
diff
changeset
|
231 init_cycle.log = log; |
|
679f60139863
nginx-0.0.1-2003-12-19-11:15:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
210
diff
changeset
|
232 ngx_cycle = &init_cycle; |
|
679f60139863
nginx-0.0.1-2003-12-19-11:15:11 import
Igor Sysoev <igor@sysoev.ru>
parents:
210
diff
changeset
|
233 |
| 501 | 234 init_cycle.pool = ngx_create_pool(1024, log); |
| 235 if (init_cycle.pool == NULL) { | |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
236 return 1; |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
237 } |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
238 |
| 611 | 239 if (ngx_save_argv(&init_cycle, argc, argv) != NGX_OK) { |
| 452 | 240 return 1; |
| 241 } | |
| 242 | |
| 2758 | 243 if (ngx_process_options(&init_cycle) != NGX_OK) { |
| 244 return 1; | |
| 245 } | |
|
448
241dc8092a33
nginx-0.1.0-2004-10-01-19:53:53 import
Igor Sysoev <igor@sysoev.ru>
parents:
444
diff
changeset
|
246 |
| 611 | 247 if (ngx_os_init(log) != NGX_OK) { |
|
443
33aec431094b
nginx-0.1.0-2004-09-29-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
248 return 1; |
|
33aec431094b
nginx-0.1.0-2004-09-29-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
249 } |
|
33aec431094b
nginx-0.1.0-2004-09-29-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
250 |
|
1694
8c696afe46b3
rename ngx_crc32_init() to ngx_crc32_table_init()
Igor Sysoev <igor@sysoev.ru>
parents:
1407
diff
changeset
|
251 /* |
|
8c696afe46b3
rename ngx_crc32_init() to ngx_crc32_table_init()
Igor Sysoev <igor@sysoev.ru>
parents:
1407
diff
changeset
|
252 * ngx_crc32_table_init() requires ngx_cacheline_size set in ngx_os_init() |
|
8c696afe46b3
rename ngx_crc32_init() to ngx_crc32_table_init()
Igor Sysoev <igor@sysoev.ru>
parents:
1407
diff
changeset
|
253 */ |
|
930
45df22906c12
allocate aligned ngx_crc32_table_short globally
Igor Sysoev <igor@sysoev.ru>
parents:
860
diff
changeset
|
254 |
|
1694
8c696afe46b3
rename ngx_crc32_init() to ngx_crc32_table_init()
Igor Sysoev <igor@sysoev.ru>
parents:
1407
diff
changeset
|
255 if (ngx_crc32_table_init() != NGX_OK) { |
|
930
45df22906c12
allocate aligned ngx_crc32_table_short globally
Igor Sysoev <igor@sysoev.ru>
parents:
860
diff
changeset
|
256 return 1; |
|
45df22906c12
allocate aligned ngx_crc32_table_short globally
Igor Sysoev <igor@sysoev.ru>
parents:
860
diff
changeset
|
257 } |
|
45df22906c12
allocate aligned ngx_crc32_table_short globally
Igor Sysoev <igor@sysoev.ru>
parents:
860
diff
changeset
|
258 |
| 611 | 259 if (ngx_add_inherited_sockets(&init_cycle) != NGX_OK) { |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
260 return 1; |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
261 } |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
262 |
|
317
1308b98496a2
nginx-0.0.3-2004-04-15-19:34:36 import
Igor Sysoev <igor@sysoev.ru>
parents:
316
diff
changeset
|
263 ngx_max_module = 0; |
|
1308b98496a2
nginx-0.0.3-2004-04-15-19:34:36 import
Igor Sysoev <igor@sysoev.ru>
parents:
316
diff
changeset
|
264 for (i = 0; ngx_modules[i]; i++) { |
|
1308b98496a2
nginx-0.0.3-2004-04-15-19:34:36 import
Igor Sysoev <igor@sysoev.ru>
parents:
316
diff
changeset
|
265 ngx_modules[i]->index = ngx_max_module++; |
|
1308b98496a2
nginx-0.0.3-2004-04-15-19:34:36 import
Igor Sysoev <igor@sysoev.ru>
parents:
316
diff
changeset
|
266 } |
|
1308b98496a2
nginx-0.0.3-2004-04-15-19:34:36 import
Igor Sysoev <igor@sysoev.ru>
parents:
316
diff
changeset
|
267 |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
268 cycle = ngx_init_cycle(&init_cycle); |
|
108
adc093f880c8
nginx-0.0.1-2003-07-02-09:01:53 import
Igor Sysoev <igor@sysoev.ru>
parents:
107
diff
changeset
|
269 if (cycle == NULL) { |
|
320
d621239c30f7
nginx-0.0.3-2004-04-18-23:06:02 import
Igor Sysoev <igor@sysoev.ru>
parents:
318
diff
changeset
|
270 if (ngx_test_config) { |
|
2743
d8316f307b6a
issue start up errors and warning on both stderr and error_log
Igor Sysoev <igor@sysoev.ru>
parents:
2738
diff
changeset
|
271 ngx_log_stderr(0, "configuration file %s test failed", |
| 2722 | 272 init_cycle.conf_file.data); |
|
320
d621239c30f7
nginx-0.0.3-2004-04-18-23:06:02 import
Igor Sysoev <igor@sysoev.ru>
parents:
318
diff
changeset
|
273 } |
|
d621239c30f7
nginx-0.0.3-2004-04-18-23:06:02 import
Igor Sysoev <igor@sysoev.ru>
parents:
318
diff
changeset
|
274 |
|
107
b5be4b0448d3
nginx-0.0.1-2003-07-01-19:00:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
106
diff
changeset
|
275 return 1; |
|
b5be4b0448d3
nginx-0.0.1-2003-07-01-19:00:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
106
diff
changeset
|
276 } |
|
b5be4b0448d3
nginx-0.0.1-2003-07-01-19:00:03 import
Igor Sysoev <igor@sysoev.ru>
parents:
106
diff
changeset
|
277 |
|
317
1308b98496a2
nginx-0.0.3-2004-04-15-19:34:36 import
Igor Sysoev <igor@sysoev.ru>
parents:
316
diff
changeset
|
278 if (ngx_test_config) { |
| 3750 | 279 if (!ngx_quiet_mode) { |
| 280 ngx_log_stderr(0, "configuration file %s test is successful", | |
| 281 cycle->conf_file.data); | |
| 282 } | |
| 283 | |
|
6187
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
284 if (ngx_dump_config) { |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
285 cd = cycle->config_dump.elts; |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
286 |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
287 for (i = 0; i < cycle->config_dump.nelts; i++) { |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
288 |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
289 ngx_write_stdout("# configuration file "); |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
290 (void) ngx_write_fd(ngx_stdout, cd[i].name.data, |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
291 cd[i].name.len); |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
292 ngx_write_stdout(":" NGX_LINEFEED); |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
293 |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
294 b = cd[i].buffer; |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
295 |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
296 (void) ngx_write_fd(ngx_stdout, b->pos, b->last - b->pos); |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
297 ngx_write_stdout(NGX_LINEFEED); |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
298 } |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
299 } |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
300 |
|
317
1308b98496a2
nginx-0.0.3-2004-04-15-19:34:36 import
Igor Sysoev <igor@sysoev.ru>
parents:
316
diff
changeset
|
301 return 0; |
|
1308b98496a2
nginx-0.0.3-2004-04-15-19:34:36 import
Igor Sysoev <igor@sysoev.ru>
parents:
316
diff
changeset
|
302 } |
|
1308b98496a2
nginx-0.0.3-2004-04-15-19:34:36 import
Igor Sysoev <igor@sysoev.ru>
parents:
316
diff
changeset
|
303 |
|
2923
d9c46f98b09f
a signaller process should stop configuration processing just after
Igor Sysoev <igor@sysoev.ru>
parents:
2767
diff
changeset
|
304 if (ngx_signal) { |
|
d9c46f98b09f
a signaller process should stop configuration processing just after
Igor Sysoev <igor@sysoev.ru>
parents:
2767
diff
changeset
|
305 return ngx_signal_process(cycle, ngx_signal); |
|
d9c46f98b09f
a signaller process should stop configuration processing just after
Igor Sysoev <igor@sysoev.ru>
parents:
2767
diff
changeset
|
306 } |
|
d9c46f98b09f
a signaller process should stop configuration processing just after
Igor Sysoev <igor@sysoev.ru>
parents:
2767
diff
changeset
|
307 |
|
449
3b1e8c9df9ad
nginx-0.1.0-2004-10-04-00:02:06 import
Igor Sysoev <igor@sysoev.ru>
parents:
448
diff
changeset
|
308 ngx_os_status(cycle->log); |
|
3b1e8c9df9ad
nginx-0.1.0-2004-10-04-00:02:06 import
Igor Sysoev <igor@sysoev.ru>
parents:
448
diff
changeset
|
309 |
|
114
ac69ab96328d
nginx-0.0.1-2003-07-07-10:11:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
113
diff
changeset
|
310 ngx_cycle = cycle; |
|
113
d7f606e25b99
nginx-0.0.1-2003-07-04-19:10:33 import
Igor Sysoev <igor@sysoev.ru>
parents:
111
diff
changeset
|
311 |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
312 ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
313 |
| 2725 | 314 if (ccf->master && ngx_process == NGX_PROCESS_SINGLE) { |
| 315 ngx_process = NGX_PROCESS_MASTER; | |
| 316 } | |
|
220
4f81b931e9ff
nginx-0.0.1-2004-01-08-11:47:17 import
Igor Sysoev <igor@sysoev.ru>
parents:
219
diff
changeset
|
317 |
|
2738
ae81441e23f4
implement "-s signal" option for Unix
Igor Sysoev <igor@sysoev.ru>
parents:
2735
diff
changeset
|
318 #if !(NGX_WIN32) |
|
115
be27f922b9a2
nginx-0.0.1-2003-07-10-20:26:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
114
diff
changeset
|
319 |
| 611 | 320 if (ngx_init_signals(cycle->log) != NGX_OK) { |
| 539 | 321 return 1; |
| 322 } | |
| 323 | |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
324 if (!ngx_inherited && ccf->daemon) { |
| 611 | 325 if (ngx_daemon(cycle->log) != NGX_OK) { |
|
115
be27f922b9a2
nginx-0.0.1-2003-07-10-20:26:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
114
diff
changeset
|
326 return 1; |
|
be27f922b9a2
nginx-0.0.1-2003-07-10-20:26:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
114
diff
changeset
|
327 } |
|
366
e411b1482ee3
nginx-0.0.7-2004-06-23-19:18:17 import
Igor Sysoev <igor@sysoev.ru>
parents:
337
diff
changeset
|
328 |
|
e411b1482ee3
nginx-0.0.7-2004-06-23-19:18:17 import
Igor Sysoev <igor@sysoev.ru>
parents:
337
diff
changeset
|
329 ngx_daemonized = 1; |
|
115
be27f922b9a2
nginx-0.0.1-2003-07-10-20:26:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
114
diff
changeset
|
330 } |
|
be27f922b9a2
nginx-0.0.1-2003-07-10-20:26:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
114
diff
changeset
|
331 |
|
4293
3bae3d8fb573
Fixed handling of SIGWINCH/NOACCEPT signal.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4283
diff
changeset
|
332 if (ngx_inherited) { |
|
3bae3d8fb573
Fixed handling of SIGWINCH/NOACCEPT signal.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4283
diff
changeset
|
333 ngx_daemonized = 1; |
|
3bae3d8fb573
Fixed handling of SIGWINCH/NOACCEPT signal.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4283
diff
changeset
|
334 } |
|
3bae3d8fb573
Fixed handling of SIGWINCH/NOACCEPT signal.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4283
diff
changeset
|
335 |
| 2725 | 336 #endif |
| 337 | |
| 611 | 338 if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
209
diff
changeset
|
339 return 1; |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
209
diff
changeset
|
340 } |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
209
diff
changeset
|
341 |
|
5260
e088695737c3
Core: consolidated log-related code.
Vladimir Homutov <vl@nginx.com>
parents:
5240
diff
changeset
|
342 if (ngx_log_redirect_stderr(cycle) != NGX_OK) { |
|
e088695737c3
Core: consolidated log-related code.
Vladimir Homutov <vl@nginx.com>
parents:
5240
diff
changeset
|
343 return 1; |
|
2743
d8316f307b6a
issue start up errors and warning on both stderr and error_log
Igor Sysoev <igor@sysoev.ru>
parents:
2738
diff
changeset
|
344 } |
|
d8316f307b6a
issue start up errors and warning on both stderr and error_log
Igor Sysoev <igor@sysoev.ru>
parents:
2738
diff
changeset
|
345 |
|
3199
b242aaf1dcfa
nginx did not close log file set by --error-log-path,
Igor Sysoev <igor@sysoev.ru>
parents:
3177
diff
changeset
|
346 if (log->file->fd != ngx_stderr) { |
|
b242aaf1dcfa
nginx did not close log file set by --error-log-path,
Igor Sysoev <igor@sysoev.ru>
parents:
3177
diff
changeset
|
347 if (ngx_close_file(log->file->fd) == NGX_FILE_ERROR) { |
|
b242aaf1dcfa
nginx did not close log file set by --error-log-path,
Igor Sysoev <igor@sysoev.ru>
parents:
3177
diff
changeset
|
348 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, |
|
b242aaf1dcfa
nginx did not close log file set by --error-log-path,
Igor Sysoev <igor@sysoev.ru>
parents:
3177
diff
changeset
|
349 ngx_close_file_n " built-in log failed"); |
|
b242aaf1dcfa
nginx did not close log file set by --error-log-path,
Igor Sysoev <igor@sysoev.ru>
parents:
3177
diff
changeset
|
350 } |
|
b242aaf1dcfa
nginx did not close log file set by --error-log-path,
Igor Sysoev <igor@sysoev.ru>
parents:
3177
diff
changeset
|
351 } |
|
b242aaf1dcfa
nginx did not close log file set by --error-log-path,
Igor Sysoev <igor@sysoev.ru>
parents:
3177
diff
changeset
|
352 |
|
2743
d8316f307b6a
issue start up errors and warning on both stderr and error_log
Igor Sysoev <igor@sysoev.ru>
parents:
2738
diff
changeset
|
353 ngx_use_stderr = 0; |
|
d8316f307b6a
issue start up errors and warning on both stderr and error_log
Igor Sysoev <igor@sysoev.ru>
parents:
2738
diff
changeset
|
354 |
| 2725 | 355 if (ngx_process == NGX_PROCESS_SINGLE) { |
| 356 ngx_single_process_cycle(cycle); | |
|
318
56496082668b
nginx-0.0.3-2004-04-16-09:14:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
317
diff
changeset
|
357 |
|
56496082668b
nginx-0.0.3-2004-04-16-09:14:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
317
diff
changeset
|
358 } else { |
| 2725 | 359 ngx_master_process_cycle(cycle); |
|
318
56496082668b
nginx-0.0.3-2004-04-16-09:14:16 import
Igor Sysoev <igor@sysoev.ru>
parents:
317
diff
changeset
|
360 } |
|
220
4f81b931e9ff
nginx-0.0.1-2004-01-08-11:47:17 import
Igor Sysoev <igor@sysoev.ru>
parents:
219
diff
changeset
|
361 |
|
4f81b931e9ff
nginx-0.0.1-2004-01-08-11:47:17 import
Igor Sysoev <igor@sysoev.ru>
parents:
219
diff
changeset
|
362 return 0; |
|
4f81b931e9ff
nginx-0.0.1-2004-01-08-11:47:17 import
Igor Sysoev <igor@sysoev.ru>
parents:
219
diff
changeset
|
363 } |
|
4f81b931e9ff
nginx-0.0.1-2004-01-08-11:47:17 import
Igor Sysoev <igor@sysoev.ru>
parents:
219
diff
changeset
|
364 |
|
4f81b931e9ff
nginx-0.0.1-2004-01-08-11:47:17 import
Igor Sysoev <igor@sysoev.ru>
parents:
219
diff
changeset
|
365 |
|
6257
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
366 static void |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
367 ngx_show_version_info() |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
368 { |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
369 ngx_write_stderr("nginx version: " NGINX_VER_BUILD NGX_LINEFEED); |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
370 |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
371 if (ngx_show_help) { |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
372 ngx_write_stderr( |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
373 "Usage: nginx [-?hvVtTq] [-s signal] [-c filename] " |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
374 "[-p prefix] [-g directives]" NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
375 NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
376 "Options:" NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
377 " -?,-h : this help" NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
378 " -v : show version and exit" NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
379 " -V : show version and configure options then exit" |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
380 NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
381 " -t : test configuration and exit" NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
382 " -T : test configuration, dump it and exit" |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
383 NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
384 " -q : suppress non-error messages " |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
385 "during configuration testing" NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
386 " -s signal : send signal to a master process: " |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
387 "stop, quit, reopen, reload" NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
388 #ifdef NGX_PREFIX |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
389 " -p prefix : set prefix path (default: " NGX_PREFIX ")" |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
390 NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
391 #else |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
392 " -p prefix : set prefix path (default: NONE)" NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
393 #endif |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
394 " -c filename : set configuration file (default: " NGX_CONF_PATH |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
395 ")" NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
396 " -g directives : set global directives out of configuration " |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
397 "file" NGX_LINEFEED NGX_LINEFEED |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
398 ); |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
399 } |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
400 |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
401 if (ngx_show_configure) { |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
402 |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
403 #ifdef NGX_COMPILER |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
404 ngx_write_stderr("built by " NGX_COMPILER NGX_LINEFEED); |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
405 #endif |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
406 |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
407 #if (NGX_SSL) |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
408 if (SSLeay() == SSLEAY_VERSION_NUMBER) { |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
409 ngx_write_stderr("built with " OPENSSL_VERSION_TEXT NGX_LINEFEED); |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
410 } else { |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
411 ngx_write_stderr("built with " OPENSSL_VERSION_TEXT |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
412 " (running with "); |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
413 ngx_write_stderr((char *) (uintptr_t) |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
414 SSLeay_version(SSLEAY_VERSION)); |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
415 ngx_write_stderr(")" NGX_LINEFEED); |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
416 } |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
417 #ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
418 ngx_write_stderr("TLS SNI support enabled" NGX_LINEFEED); |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
419 #else |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
420 ngx_write_stderr("TLS SNI support disabled" NGX_LINEFEED); |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
421 #endif |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
422 #endif |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
423 |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
424 ngx_write_stderr("configure arguments:" NGX_CONFIGURE NGX_LINEFEED); |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
425 } |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
426 } |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
427 |
|
5eb4d7541107
Extract out version info function.
Kurtis Nusbaum <klnusbaum@gmail.com>
parents:
6187
diff
changeset
|
428 |
| 499 | 429 static ngx_int_t |
| 430 ngx_add_inherited_sockets(ngx_cycle_t *cycle) | |
|
219
f57597ec5249
nginx-0.0.1-2004-01-06-19:49:34 import
Igor Sysoev <igor@sysoev.ru>
parents:
218
diff
changeset
|
431 { |
| 501 | 432 u_char *p, *v, *inherited; |
| 433 ngx_int_t s; | |
| 434 ngx_listening_t *ls; | |
|
219
f57597ec5249
nginx-0.0.1-2004-01-06-19:49:34 import
Igor Sysoev <igor@sysoev.ru>
parents:
218
diff
changeset
|
435 |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
289
diff
changeset
|
436 inherited = (u_char *) getenv(NGINX_VAR); |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
437 |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
438 if (inherited == NULL) { |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
439 return NGX_OK; |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
440 } |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
441 |
| 461 | 442 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
443 "using inherited sockets from \"%s\"", inherited); |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
444 |
| 461 | 445 if (ngx_array_init(&cycle->listening, cycle->pool, 10, |
| 745 | 446 sizeof(ngx_listening_t)) |
|
2536
a6d6d762c554
small optimization: " == NGX_ERROR" > " != NGX_OK"
Igor Sysoev <igor@sysoev.ru>
parents:
2302
diff
changeset
|
447 != NGX_OK) |
| 461 | 448 { |
| 449 return NGX_ERROR; | |
| 450 } | |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
451 |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
452 for (p = inherited, v = p; *p; p++) { |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
453 if (*p == ':' || *p == ';') { |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
454 s = ngx_atoi(v, p - v); |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
455 if (s == NGX_ERROR) { |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
456 ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, |
| 537 | 457 "invalid socket number \"%s\" in " NGINX_VAR |
| 458 " environment variable, ignoring the rest" | |
| 459 " of the variable", v); | |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
460 break; |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
461 } |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
462 |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
289
diff
changeset
|
463 v = p + 1; |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
464 |
| 501 | 465 ls = ngx_array_push(&cycle->listening); |
| 466 if (ls == NULL) { | |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
467 return NGX_ERROR; |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
289
diff
changeset
|
468 } |
|
219
f57597ec5249
nginx-0.0.1-2004-01-06-19:49:34 import
Igor Sysoev <igor@sysoev.ru>
parents:
218
diff
changeset
|
469 |
| 523 | 470 ngx_memzero(ls, sizeof(ngx_listening_t)); |
| 471 | |
| 501 | 472 ls->fd = (ngx_socket_t) s; |
|
219
f57597ec5249
nginx-0.0.1-2004-01-06-19:49:34 import
Igor Sysoev <igor@sysoev.ru>
parents:
218
diff
changeset
|
473 } |
|
f57597ec5249
nginx-0.0.1-2004-01-06-19:49:34 import
Igor Sysoev <igor@sysoev.ru>
parents:
218
diff
changeset
|
474 } |
|
f57597ec5249
nginx-0.0.1-2004-01-06-19:49:34 import
Igor Sysoev <igor@sysoev.ru>
parents:
218
diff
changeset
|
475 |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
476 ngx_inherited = 1; |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
477 |
|
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
478 return ngx_set_inherited_sockets(cycle); |
|
219
f57597ec5249
nginx-0.0.1-2004-01-06-19:49:34 import
Igor Sysoev <igor@sysoev.ru>
parents:
218
diff
changeset
|
479 } |
|
f57597ec5249
nginx-0.0.1-2004-01-06-19:49:34 import
Igor Sysoev <igor@sysoev.ru>
parents:
218
diff
changeset
|
480 |
|
f57597ec5249
nginx-0.0.1-2004-01-06-19:49:34 import
Igor Sysoev <igor@sysoev.ru>
parents:
218
diff
changeset
|
481 |
| 1069 | 482 char ** |
| 483 ngx_set_environment(ngx_cycle_t *cycle, ngx_uint_t *last) | |
| 484 { | |
| 485 char **p, **env; | |
| 486 ngx_str_t *var; | |
| 487 ngx_uint_t i, n; | |
| 488 ngx_core_conf_t *ccf; | |
| 489 | |
| 490 ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); | |
| 491 | |
| 1080 | 492 if (last == NULL && ccf->environment) { |
| 493 return ccf->environment; | |
| 1069 | 494 } |
| 495 | |
| 496 var = ccf->env.elts; | |
| 497 | |
| 498 for (i = 0; i < ccf->env.nelts; i++) { | |
| 499 if (ngx_strcmp(var[i].data, "TZ") == 0 | |
| 500 || ngx_strncmp(var[i].data, "TZ=", 3) == 0) | |
| 501 { | |
| 502 goto tz_found; | |
| 503 } | |
| 504 } | |
| 505 | |
| 506 var = ngx_array_push(&ccf->env); | |
| 1318 | 507 if (var == NULL) { |
| 508 return NULL; | |
| 509 } | |
| 1069 | 510 |
| 511 var->len = 2; | |
| 512 var->data = (u_char *) "TZ"; | |
| 513 | |
| 514 var = ccf->env.elts; | |
| 515 | |
| 516 tz_found: | |
| 517 | |
| 1080 | 518 n = 0; |
| 519 | |
| 1069 | 520 for (i = 0; i < ccf->env.nelts; i++) { |
| 521 | |
| 522 if (var[i].data[var[i].len] == '=') { | |
| 523 n++; | |
| 524 continue; | |
| 525 } | |
| 526 | |
| 527 for (p = ngx_os_environ; *p; p++) { | |
| 528 | |
| 529 if (ngx_strncmp(*p, var[i].data, var[i].len) == 0 | |
| 530 && (*p)[var[i].len] == '=') | |
| 531 { | |
| 532 n++; | |
| 533 break; | |
| 534 } | |
| 535 } | |
| 536 } | |
| 537 | |
| 538 if (last) { | |
| 1080 | 539 env = ngx_alloc((*last + n + 1) * sizeof(char *), cycle->log); |
| 1069 | 540 *last = n; |
| 541 | |
| 542 } else { | |
| 543 env = ngx_palloc(cycle->pool, (n + 1) * sizeof(char *)); | |
| 544 } | |
| 545 | |
| 546 if (env == NULL) { | |
| 547 return NULL; | |
| 548 } | |
| 549 | |
| 550 n = 0; | |
| 551 | |
| 552 for (i = 0; i < ccf->env.nelts; i++) { | |
| 553 | |
| 554 if (var[i].data[var[i].len] == '=') { | |
| 555 env[n++] = (char *) var[i].data; | |
| 556 continue; | |
| 557 } | |
| 558 | |
| 559 for (p = ngx_os_environ; *p; p++) { | |
| 560 | |
| 561 if (ngx_strncmp(*p, var[i].data, var[i].len) == 0 | |
| 562 && (*p)[var[i].len] == '=') | |
| 563 { | |
| 564 env[n++] = *p; | |
| 565 break; | |
| 566 } | |
| 567 } | |
| 568 } | |
| 569 | |
| 570 env[n] = NULL; | |
| 571 | |
| 572 if (last == NULL) { | |
| 573 ccf->environment = env; | |
| 574 environ = env; | |
| 575 } | |
| 576 | |
| 577 return env; | |
| 578 } | |
| 579 | |
| 580 | |
| 543 | 581 ngx_pid_t |
| 582 ngx_exec_new_binary(ngx_cycle_t *cycle, char *const *argv) | |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
583 { |
| 1069 | 584 char **env, *var; |
| 585 u_char *p; | |
| 586 ngx_uint_t i, n; | |
| 587 ngx_pid_t pid; | |
| 588 ngx_exec_ctx_t ctx; | |
| 589 ngx_core_conf_t *ccf; | |
| 590 ngx_listening_t *ls; | |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
591 |
|
2745
1983932b8075
pass command lines options to workers
Igor Sysoev <igor@sysoev.ru>
parents:
2743
diff
changeset
|
592 ngx_memzero(&ctx, sizeof(ngx_exec_ctx_t)); |
|
1983932b8075
pass command lines options to workers
Igor Sysoev <igor@sysoev.ru>
parents:
2743
diff
changeset
|
593 |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
594 ctx.path = argv[0]; |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
595 ctx.name = "new binary process"; |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
596 ctx.argv = argv; |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
597 |
| 1069 | 598 n = 2; |
| 599 env = ngx_set_environment(cycle, &n); | |
| 600 if (env == NULL) { | |
| 601 return NGX_INVALID_PID; | |
| 602 } | |
| 603 | |
|
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
279
diff
changeset
|
604 var = ngx_alloc(sizeof(NGINX_VAR) |
| 501 | 605 + cycle->listening.nelts * (NGX_INT32_LEN + 1) + 2, |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
606 cycle->log); |
|
5116
4d7027deb1bb
Core: guard against failed allocation during binary upgrade.
Ruslan Ermilov <ru@nginx.com>
parents:
4890
diff
changeset
|
607 if (var == NULL) { |
|
5122
3450eee1ee8d
Core: fixed resource leak if binary upgrade fails due to no memory.
Ruslan Ermilov <ru@nginx.com>
parents:
5116
diff
changeset
|
608 ngx_free(env); |
|
5116
4d7027deb1bb
Core: guard against failed allocation during binary upgrade.
Ruslan Ermilov <ru@nginx.com>
parents:
4890
diff
changeset
|
609 return NGX_INVALID_PID; |
|
4d7027deb1bb
Core: guard against failed allocation during binary upgrade.
Ruslan Ermilov <ru@nginx.com>
parents:
4890
diff
changeset
|
610 } |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
611 |
| 461 | 612 p = ngx_cpymem(var, NGINX_VAR "=", sizeof(NGINX_VAR)); |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
613 |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
614 ls = cycle->listening.elts; |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
615 for (i = 0; i < cycle->listening.nelts; i++) { |
| 461 | 616 p = ngx_sprintf(p, "%ud;", ls[i].fd); |
|
114
ac69ab96328d
nginx-0.0.1-2003-07-07-10:11:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
113
diff
changeset
|
617 } |
|
ac69ab96328d
nginx-0.0.1-2003-07-07-10:11:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
113
diff
changeset
|
618 |
| 461 | 619 *p = '\0'; |
| 620 | |
| 1069 | 621 env[n++] = var; |
| 452 | 622 |
| 623 #if (NGX_SETPROCTITLE_USES_ENV) | |
| 624 | |
| 461 | 625 /* allocate the spare 300 bytes for the new binary process title */ |
| 452 | 626 |
| 1069 | 627 env[n++] = "SPARE=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" |
| 628 "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" | |
| 629 "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" | |
| 630 "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" | |
| 631 "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"; | |
| 452 | 632 |
| 633 #endif | |
| 634 | |
| 1069 | 635 env[n] = NULL; |
| 636 | |
| 637 #if (NGX_DEBUG) | |
| 638 { | |
| 639 char **e; | |
| 640 for (e = env; *e; e++) { | |
| 641 ngx_log_debug1(NGX_LOG_DEBUG_CORE, cycle->log, 0, "env: %s", *e); | |
| 642 } | |
| 643 } | |
| 644 #endif | |
| 645 | |
| 646 ctx.envp = (char *const *) env; | |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
647 |
| 543 | 648 ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); |
| 649 | |
|
5137
f941cf265cc5
Use NGX_FILE_ERROR for handling file operations errors.
Valentin Bartenev <vbart@nginx.com>
parents:
5122
diff
changeset
|
650 if (ngx_rename_file(ccf->pid.data, ccf->oldpid.data) == NGX_FILE_ERROR) { |
| 543 | 651 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, |
| 652 ngx_rename_file_n " %s to %s failed " | |
| 653 "before executing new binary process \"%s\"", | |
| 654 ccf->pid.data, ccf->oldpid.data, argv[0]); | |
| 655 | |
| 1069 | 656 ngx_free(env); |
| 543 | 657 ngx_free(var); |
| 658 | |
| 659 return NGX_INVALID_PID; | |
| 660 } | |
| 661 | |
|
279
b79f021a644a
nginx-0.0.2-2004-03-04-19:34:23 import
Igor Sysoev <igor@sysoev.ru>
parents:
278
diff
changeset
|
662 pid = ngx_execute(cycle, &ctx); |
|
114
ac69ab96328d
nginx-0.0.1-2003-07-07-10:11:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
113
diff
changeset
|
663 |
| 543 | 664 if (pid == NGX_INVALID_PID) { |
|
5137
f941cf265cc5
Use NGX_FILE_ERROR for handling file operations errors.
Valentin Bartenev <vbart@nginx.com>
parents:
5122
diff
changeset
|
665 if (ngx_rename_file(ccf->oldpid.data, ccf->pid.data) |
|
f941cf265cc5
Use NGX_FILE_ERROR for handling file operations errors.
Valentin Bartenev <vbart@nginx.com>
parents:
5122
diff
changeset
|
666 == NGX_FILE_ERROR) |
|
f941cf265cc5
Use NGX_FILE_ERROR for handling file operations errors.
Valentin Bartenev <vbart@nginx.com>
parents:
5122
diff
changeset
|
667 { |
| 543 | 668 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, |
| 1069 | 669 ngx_rename_file_n " %s back to %s failed after " |
|
4593
834049edae24
Fixed grammar in error messages.
Ruslan Ermilov <ru@nginx.com>
parents:
4549
diff
changeset
|
670 "an attempt to execute new binary process \"%s\"", |
| 543 | 671 ccf->oldpid.data, ccf->pid.data, argv[0]); |
| 672 } | |
| 673 } | |
| 674 | |
| 1069 | 675 ngx_free(env); |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
676 ngx_free(var); |
|
226
b0c1e21e68db
nginx-0.0.1-2004-01-14-00:33:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
225
diff
changeset
|
677 |
|
b0c1e21e68db
nginx-0.0.1-2004-01-14-00:33:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
225
diff
changeset
|
678 return pid; |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
679 } |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
680 |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
681 |
| 543 | 682 static ngx_int_t |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
683 ngx_get_options(int argc, char *const *argv) |
|
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
684 { |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
685 u_char *p; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
686 ngx_int_t i; |
|
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
687 |
| 452 | 688 for (i = 1; i < argc; i++) { |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
689 |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
690 p = (u_char *) argv[i]; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
691 |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
692 if (*p++ != '-') { |
|
2743
d8316f307b6a
issue start up errors and warning on both stderr and error_log
Igor Sysoev <igor@sysoev.ru>
parents:
2738
diff
changeset
|
693 ngx_log_stderr(0, "invalid option: \"%s\"", argv[i]); |
|
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
694 return NGX_ERROR; |
|
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
695 } |
|
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
696 |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
697 while (*p) { |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
698 |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
699 switch (*p++) { |
|
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
700 |
| 2735 | 701 case '?': |
| 702 case 'h': | |
| 703 ngx_show_version = 1; | |
| 704 ngx_show_help = 1; | |
| 705 break; | |
| 706 | |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
707 case 'v': |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
708 ngx_show_version = 1; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
709 break; |
| 639 | 710 |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
711 case 'V': |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
712 ngx_show_version = 1; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
713 ngx_show_configure = 1; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
714 break; |
| 945 | 715 |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
716 case 't': |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
717 ngx_test_config = 1; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
718 break; |
|
317
1308b98496a2
nginx-0.0.3-2004-04-15-19:34:36 import
Igor Sysoev <igor@sysoev.ru>
parents:
316
diff
changeset
|
719 |
|
6187
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
720 case 'T': |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
721 ngx_test_config = 1; |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
722 ngx_dump_config = 1; |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
723 break; |
|
1b7e246e6b38
Core: store and dump processed configuration.
Vladimir Homutov <vl@nginx.com>
parents:
6127
diff
changeset
|
724 |
| 3750 | 725 case 'q': |
| 726 ngx_quiet_mode = 1; | |
| 727 break; | |
| 728 | |
| 2758 | 729 case 'p': |
| 730 if (*p) { | |
| 731 ngx_prefix = p; | |
| 732 goto next; | |
| 733 } | |
| 734 | |
| 735 if (argv[++i]) { | |
| 736 ngx_prefix = (u_char *) argv[i]; | |
| 737 goto next; | |
| 738 } | |
| 739 | |
| 740 ngx_log_stderr(0, "option \"-p\" requires directory name"); | |
| 741 return NGX_ERROR; | |
| 742 | |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
743 case 'c': |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
744 if (*p) { |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
745 ngx_conf_file = p; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
746 goto next; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
747 } |
|
316
a0beefedaf94
nginx-0.0.3-2004-04-15-00:34:05 import
Igor Sysoev <igor@sysoev.ru>
parents:
314
diff
changeset
|
748 |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
749 if (argv[++i]) { |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
750 ngx_conf_file = (u_char *) argv[i]; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
751 goto next; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
752 } |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
753 |
|
2743
d8316f307b6a
issue start up errors and warning on both stderr and error_log
Igor Sysoev <igor@sysoev.ru>
parents:
2738
diff
changeset
|
754 ngx_log_stderr(0, "option \"-c\" requires file name"); |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
755 return NGX_ERROR; |
|
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
756 |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
757 case 'g': |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
758 if (*p) { |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
759 ngx_conf_params = p; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
760 goto next; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
761 } |
| 2073 | 762 |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
763 if (argv[++i]) { |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
764 ngx_conf_params = (u_char *) argv[i]; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
765 goto next; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
766 } |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
767 |
|
2743
d8316f307b6a
issue start up errors and warning on both stderr and error_log
Igor Sysoev <igor@sysoev.ru>
parents:
2738
diff
changeset
|
768 ngx_log_stderr(0, "option \"-g\" requires parameter"); |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
769 return NGX_ERROR; |
| 2073 | 770 |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
771 case 's': |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
772 if (*p) { |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
773 ngx_signal = (char *) p; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
774 |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
775 } else if (argv[++i]) { |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
776 ngx_signal = argv[i]; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
777 |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
778 } else { |
|
2743
d8316f307b6a
issue start up errors and warning on both stderr and error_log
Igor Sysoev <igor@sysoev.ru>
parents:
2738
diff
changeset
|
779 ngx_log_stderr(0, "option \"-s\" requires parameter"); |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
780 return NGX_ERROR; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
781 } |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
782 |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
783 if (ngx_strcmp(ngx_signal, "stop") == 0 |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
784 || ngx_strcmp(ngx_signal, "quit") == 0 |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
785 || ngx_strcmp(ngx_signal, "reopen") == 0 |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
786 || ngx_strcmp(ngx_signal, "reload") == 0) |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
787 { |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
788 ngx_process = NGX_PROCESS_SIGNALLER; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
789 goto next; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
790 } |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
791 |
|
2743
d8316f307b6a
issue start up errors and warning on both stderr and error_log
Igor Sysoev <igor@sysoev.ru>
parents:
2738
diff
changeset
|
792 ngx_log_stderr(0, "invalid option: \"-s %s\"", ngx_signal); |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
793 return NGX_ERROR; |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
794 |
|
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
795 default: |
|
2743
d8316f307b6a
issue start up errors and warning on both stderr and error_log
Igor Sysoev <igor@sysoev.ru>
parents:
2738
diff
changeset
|
796 ngx_log_stderr(0, "invalid option: \"%c\"", *(p - 1)); |
| 2725 | 797 return NGX_ERROR; |
| 798 } | |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
799 } |
| 2725 | 800 |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
801 next: |
| 2725 | 802 |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
803 continue; |
|
255
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
804 } |
|
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
805 |
|
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
806 return NGX_OK; |
|
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
807 } |
|
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
808 |
|
e6938ca7331a
nginx-0.0.2-2004-02-09-23:47:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
253
diff
changeset
|
809 |
| 499 | 810 static ngx_int_t |
| 811 ngx_save_argv(ngx_cycle_t *cycle, int argc, char *const *argv) | |
| 452 | 812 { |
| 501 | 813 #if (NGX_FREEBSD) |
| 814 | |
| 815 ngx_os_argv = (char **) argv; | |
| 816 ngx_argc = argc; | |
| 817 ngx_argv = (char **) argv; | |
| 818 | |
| 819 #else | |
| 452 | 820 size_t len; |
| 821 ngx_int_t i; | |
| 822 | |
| 823 ngx_os_argv = (char **) argv; | |
| 824 ngx_argc = argc; | |
| 825 | |
| 501 | 826 ngx_argv = ngx_alloc((argc + 1) * sizeof(char *), cycle->log); |
| 827 if (ngx_argv == NULL) { | |
| 452 | 828 return NGX_ERROR; |
| 829 } | |
| 830 | |
| 831 for (i = 0; i < argc; i++) { | |
| 832 len = ngx_strlen(argv[i]) + 1; | |
| 833 | |
| 501 | 834 ngx_argv[i] = ngx_alloc(len, cycle->log); |
| 835 if (ngx_argv[i] == NULL) { | |
| 452 | 836 return NGX_ERROR; |
| 837 } | |
| 838 | |
| 517 | 839 (void) ngx_cpystrn((u_char *) ngx_argv[i], (u_char *) argv[i], len); |
| 452 | 840 } |
| 841 | |
| 842 ngx_argv[i] = NULL; | |
| 843 | |
| 844 #endif | |
| 845 | |
| 1069 | 846 ngx_os_environ = environ; |
| 847 | |
| 452 | 848 return NGX_OK; |
| 849 } | |
| 850 | |
| 851 | |
| 2758 | 852 static ngx_int_t |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
853 ngx_process_options(ngx_cycle_t *cycle) |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
854 { |
| 2758 | 855 u_char *p; |
| 856 size_t len; | |
| 857 | |
| 858 if (ngx_prefix) { | |
| 859 len = ngx_strlen(ngx_prefix); | |
| 860 p = ngx_prefix; | |
| 861 | |
|
4783
2220ce29b9d3
Fixed the -p parameter handling.
Ruslan Ermilov <ru@nginx.com>
parents:
4593
diff
changeset
|
862 if (len && !ngx_path_separator(p[len - 1])) { |
| 2758 | 863 p = ngx_pnalloc(cycle->pool, len + 1); |
| 864 if (p == NULL) { | |
| 865 return NGX_ERROR; | |
| 866 } | |
| 867 | |
| 868 ngx_memcpy(p, ngx_prefix, len); | |
| 869 p[len++] = '/'; | |
| 870 } | |
| 871 | |
| 872 cycle->conf_prefix.len = len; | |
| 873 cycle->conf_prefix.data = p; | |
| 874 cycle->prefix.len = len; | |
| 875 cycle->prefix.data = p; | |
| 876 | |
| 877 } else { | |
| 878 | |
| 879 #ifndef NGX_PREFIX | |
| 880 | |
| 881 p = ngx_pnalloc(cycle->pool, NGX_MAX_PATH); | |
| 882 if (p == NULL) { | |
| 883 return NGX_ERROR; | |
| 884 } | |
| 885 | |
| 886 if (ngx_getcwd(p, NGX_MAX_PATH) == 0) { | |
| 887 ngx_log_stderr(ngx_errno, "[emerg]: " ngx_getcwd_n " failed"); | |
| 888 return NGX_ERROR; | |
| 889 } | |
| 890 | |
| 891 len = ngx_strlen(p); | |
| 892 | |
| 893 p[len++] = '/'; | |
| 894 | |
| 895 cycle->conf_prefix.len = len; | |
| 896 cycle->conf_prefix.data = p; | |
| 897 cycle->prefix.len = len; | |
| 898 cycle->prefix.data = p; | |
| 899 | |
| 900 #else | |
| 901 | |
| 902 #ifdef NGX_CONF_PREFIX | |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3480
diff
changeset
|
903 ngx_str_set(&cycle->conf_prefix, NGX_CONF_PREFIX); |
| 2758 | 904 #else |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3480
diff
changeset
|
905 ngx_str_set(&cycle->conf_prefix, NGX_PREFIX); |
| 2758 | 906 #endif |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3480
diff
changeset
|
907 ngx_str_set(&cycle->prefix, NGX_PREFIX); |
| 2758 | 908 |
| 909 #endif | |
| 910 } | |
| 911 | |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
912 if (ngx_conf_file) { |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
913 cycle->conf_file.len = ngx_strlen(ngx_conf_file); |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
914 cycle->conf_file.data = ngx_conf_file; |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
915 |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
916 } else { |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3480
diff
changeset
|
917 ngx_str_set(&cycle->conf_file, NGX_CONF_PATH); |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
918 } |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
919 |
|
5330
314c3d7cc3a5
Backed out f1a91825730a and 7094bd12c1ff.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5317
diff
changeset
|
920 if (ngx_conf_full_name(cycle, &cycle->conf_file, 0) != NGX_OK) { |
| 2758 | 921 return NGX_ERROR; |
| 922 } | |
| 923 | |
| 924 for (p = cycle->conf_file.data + cycle->conf_file.len - 1; | |
| 925 p > cycle->conf_file.data; | |
| 926 p--) | |
| 927 { | |
| 928 if (ngx_path_separator(*p)) { | |
| 929 cycle->conf_prefix.len = p - ngx_cycle->conf_file.data + 1; | |
| 930 cycle->conf_prefix.data = ngx_cycle->conf_file.data; | |
| 931 break; | |
| 932 } | |
| 933 } | |
| 934 | |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
935 if (ngx_conf_params) { |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
936 cycle->conf_param.len = ngx_strlen(ngx_conf_params); |
|
2733
edc01cc34b3e
allow condensed command lines options
Igor Sysoev <igor@sysoev.ru>
parents:
2730
diff
changeset
|
937 cycle->conf_param.data = ngx_conf_params; |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
938 } |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
939 |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
940 if (ngx_test_config) { |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
941 cycle->log->log_level = NGX_LOG_INFO; |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
942 } |
| 2758 | 943 |
| 944 return NGX_OK; | |
|
2730
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
945 } |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
946 |
|
95a17423afdb
test command line options before ngx_log_init() and issue errors to stderr
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
947 |
| 499 | 948 static void * |
| 949 ngx_core_module_create_conf(ngx_cycle_t *cycle) | |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
950 { |
|
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
951 ngx_core_conf_t *ccf; |
|
114
ac69ab96328d
nginx-0.0.1-2003-07-07-10:11:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
113
diff
changeset
|
952 |
| 501 | 953 ccf = ngx_pcalloc(cycle->pool, sizeof(ngx_core_conf_t)); |
| 954 if (ccf == NULL) { | |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
955 return NULL; |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
956 } |
| 479 | 957 |
| 958 /* | |
| 3480 | 959 * set by ngx_pcalloc() |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
960 * |
| 479 | 961 * ccf->pid = NULL; |
| 543 | 962 * ccf->oldpid = NULL; |
| 479 | 963 * ccf->priority = 0; |
| 577 | 964 * ccf->cpu_affinity_n = 0; |
| 965 * ccf->cpu_affinity = NULL; | |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
966 */ |
| 479 | 967 |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
968 ccf->daemon = NGX_CONF_UNSET; |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
969 ccf->master = NGX_CONF_UNSET; |
| 563 | 970 ccf->timer_resolution = NGX_CONF_UNSET_MSEC; |
| 971 | |
|
300
502b03d9d2a3
nginx-0.0.3-2004-03-31-00:31:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
972 ccf->worker_processes = NGX_CONF_UNSET; |
| 461 | 973 ccf->debug_points = NGX_CONF_UNSET; |
| 543 | 974 |
| 975 ccf->rlimit_nofile = NGX_CONF_UNSET; | |
|
3762
89002ac695e5
worker_rlimit_core should be off_t
Igor Sysoev <igor@sysoev.ru>
parents:
3750
diff
changeset
|
976 ccf->rlimit_core = NGX_CONF_UNSET; |
| 543 | 977 |
| 517 | 978 ccf->user = (ngx_uid_t) NGX_CONF_UNSET_UINT; |
| 979 ccf->group = (ngx_gid_t) NGX_CONF_UNSET_UINT; | |
| 543 | 980 |
| 1069 | 981 if (ngx_array_init(&ccf->env, cycle->pool, 1, sizeof(ngx_str_t)) |
| 982 != NGX_OK) | |
| 983 { | |
| 984 return NULL; | |
| 985 } | |
| 986 | |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
987 return ccf; |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
988 } |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
989 |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
990 |
| 499 | 991 static char * |
| 992 ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf) | |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
993 { |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
994 ngx_core_conf_t *ccf = conf; |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
995 |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
996 ngx_conf_init_value(ccf->daemon, 1); |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
997 ngx_conf_init_value(ccf->master, 1); |
| 563 | 998 ngx_conf_init_msec_value(ccf->timer_resolution, 0); |
| 999 | |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
1000 ngx_conf_init_value(ccf->worker_processes, 1); |
| 461 | 1001 ngx_conf_init_value(ccf->debug_points, 0); |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
1002 |
|
4549
f31162fefe01
worker_cpu_affinity: cleaned up Linux implementation, added FreeBSD support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
1003 #if (NGX_HAVE_CPU_AFFINITY) |
| 577 | 1004 |
| 1005 if (ccf->cpu_affinity_n | |
| 1006 && ccf->cpu_affinity_n != 1 | |
| 1007 && ccf->cpu_affinity_n != (ngx_uint_t) ccf->worker_processes) | |
| 1008 { | |
| 1009 ngx_log_error(NGX_LOG_WARN, cycle->log, 0, | |
|
4549
f31162fefe01
worker_cpu_affinity: cleaned up Linux implementation, added FreeBSD support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
1010 "the number of \"worker_processes\" is not equal to " |
|
f31162fefe01
worker_cpu_affinity: cleaned up Linux implementation, added FreeBSD support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
1011 "the number of \"worker_cpu_affinity\" masks, " |
| 577 | 1012 "using last mask for remaining worker processes"); |
| 1013 } | |
| 1014 | |
| 1015 #endif | |
| 1016 | |
| 2725 | 1017 |
| 1018 if (ccf->pid.len == 0) { | |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3480
diff
changeset
|
1019 ngx_str_set(&ccf->pid, NGX_PID_PATH); |
| 2725 | 1020 } |
| 1021 | |
|
5330
314c3d7cc3a5
Backed out f1a91825730a and 7094bd12c1ff.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5317
diff
changeset
|
1022 if (ngx_conf_full_name(cycle, &ccf->pid, 0) != NGX_OK) { |
| 2725 | 1023 return NGX_CONF_ERROR; |
| 1024 } | |
| 1025 | |
| 1026 ccf->oldpid.len = ccf->pid.len + sizeof(NGX_OLDPID_EXT); | |
| 1027 | |
| 1028 ccf->oldpid.data = ngx_pnalloc(cycle->pool, ccf->oldpid.len); | |
| 1029 if (ccf->oldpid.data == NULL) { | |
| 1030 return NGX_CONF_ERROR; | |
| 1031 } | |
| 1032 | |
| 1033 ngx_memcpy(ngx_cpymem(ccf->oldpid.data, ccf->pid.data, ccf->pid.len), | |
| 1034 NGX_OLDPID_EXT, sizeof(NGX_OLDPID_EXT)); | |
| 1035 | |
| 1036 | |
| 461 | 1037 #if !(NGX_WIN32) |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
1038 |
| 517 | 1039 if (ccf->user == (uid_t) NGX_CONF_UNSET_UINT && geteuid() == 0) { |
|
1704
e584e946e198
move condition declarations inside blocks where they are used
Igor Sysoev <igor@sysoev.ru>
parents:
1694
diff
changeset
|
1040 struct group *grp; |
|
e584e946e198
move condition declarations inside blocks where they are used
Igor Sysoev <igor@sysoev.ru>
parents:
1694
diff
changeset
|
1041 struct passwd *pwd; |
|
440
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1042 |
| 1288 | 1043 ngx_set_errno(0); |
| 455 | 1044 pwd = getpwnam(NGX_USER); |
|
440
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1045 if (pwd == NULL) { |
|
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1046 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, |
| 455 | 1047 "getpwnam(\"" NGX_USER "\") failed"); |
|
440
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1048 return NGX_CONF_ERROR; |
|
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1049 } |
|
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1050 |
| 473 | 1051 ccf->username = NGX_USER; |
|
440
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1052 ccf->user = pwd->pw_uid; |
|
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1053 |
| 1288 | 1054 ngx_set_errno(0); |
| 455 | 1055 grp = getgrnam(NGX_GROUP); |
|
440
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1056 if (grp == NULL) { |
|
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1057 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, |
| 455 | 1058 "getgrnam(\"" NGX_GROUP "\") failed"); |
|
440
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1059 return NGX_CONF_ERROR; |
|
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1060 } |
|
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1061 |
|
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1062 ccf->group = grp->gr_gid; |
|
f390d1775430
nginx-0.1.0-2004-09-27-20:03:21 import
Igor Sysoev <igor@sysoev.ru>
parents:
409
diff
changeset
|
1063 } |
|
218
05592fd7a436
nginx-0.0.1-2004-01-05-23:55:48 import
Igor Sysoev <igor@sysoev.ru>
parents:
217
diff
changeset
|
1064 |
|
860
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1065 |
| 611 | 1066 if (ccf->lock_file.len == 0) { |
|
3516
dd1570b6f237
ngx_str_set() and ngx_str_null()
Igor Sysoev <igor@sysoev.ru>
parents:
3480
diff
changeset
|
1067 ngx_str_set(&ccf->lock_file, NGX_LOCK_PATH); |
| 611 | 1068 } |
| 1069 | |
|
5330
314c3d7cc3a5
Backed out f1a91825730a and 7094bd12c1ff.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5317
diff
changeset
|
1070 if (ngx_conf_full_name(cycle, &ccf->lock_file, 0) != NGX_OK) { |
| 611 | 1071 return NGX_CONF_ERROR; |
| 1072 } | |
| 1073 | |
|
1704
e584e946e198
move condition declarations inside blocks where they are used
Igor Sysoev <igor@sysoev.ru>
parents:
1694
diff
changeset
|
1074 { |
|
e584e946e198
move condition declarations inside blocks where they are used
Igor Sysoev <igor@sysoev.ru>
parents:
1694
diff
changeset
|
1075 ngx_str_t lock_file; |
|
e584e946e198
move condition declarations inside blocks where they are used
Igor Sysoev <igor@sysoev.ru>
parents:
1694
diff
changeset
|
1076 |
|
860
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1077 lock_file = cycle->old_cycle->lock_file; |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1078 |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1079 if (lock_file.len) { |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1080 lock_file.len--; |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1081 |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1082 if (ccf->lock_file.len != lock_file.len |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1083 || ngx_strncmp(ccf->lock_file.data, lock_file.data, lock_file.len) |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1084 != 0) |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1085 { |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1086 ngx_log_error(NGX_LOG_EMERG, cycle->log, 0, |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1087 "\"lock_file\" could not be changed, ignored"); |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1088 } |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1089 |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1090 cycle->lock_file.len = lock_file.len + 1; |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1091 lock_file.len += sizeof(".accept"); |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1092 |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1093 cycle->lock_file.data = ngx_pstrdup(cycle->pool, &lock_file); |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1094 if (cycle->lock_file.data == NULL) { |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1095 return NGX_CONF_ERROR; |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1096 } |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1097 |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1098 } else { |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1099 cycle->lock_file.len = ccf->lock_file.len + 1; |
| 2049 | 1100 cycle->lock_file.data = ngx_pnalloc(cycle->pool, |
|
860
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1101 ccf->lock_file.len + sizeof(".accept")); |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1102 if (cycle->lock_file.data == NULL) { |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1103 return NGX_CONF_ERROR; |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1104 } |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1105 |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1106 ngx_memcpy(ngx_cpymem(cycle->lock_file.data, ccf->lock_file.data, |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1107 ccf->lock_file.len), |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1108 ".accept", sizeof(".accept")); |
|
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1109 } |
|
1704
e584e946e198
move condition declarations inside blocks where they are used
Igor Sysoev <igor@sysoev.ru>
parents:
1694
diff
changeset
|
1110 } |
|
860
201d017ea470
slab allocator in shared memory
Igor Sysoev <igor@sysoev.ru>
parents:
796
diff
changeset
|
1111 |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
1112 #endif |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
1113 |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
1114 return NGX_CONF_OK; |
|
114
ac69ab96328d
nginx-0.0.1-2003-07-07-10:11:50 import
Igor Sysoev <igor@sysoev.ru>
parents:
113
diff
changeset
|
1115 } |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1116 |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1117 |
| 499 | 1118 static char * |
| 1119 ngx_set_user(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1120 { |
| 461 | 1121 #if (NGX_WIN32) |
|
278
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
270
diff
changeset
|
1122 |
|
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
270
diff
changeset
|
1123 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, |
|
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
270
diff
changeset
|
1124 "\"user\" is not supported, ignored"); |
|
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
270
diff
changeset
|
1125 |
|
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
270
diff
changeset
|
1126 return NGX_CONF_OK; |
|
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
270
diff
changeset
|
1127 |
|
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
270
diff
changeset
|
1128 #else |
|
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
270
diff
changeset
|
1129 |
|
311
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
1130 ngx_core_conf_t *ccf = conf; |
|
11ff50a35d6d
nginx-0.0.3-2004-04-12-20:38:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
310
diff
changeset
|
1131 |
| 455 | 1132 char *group; |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1133 struct passwd *pwd; |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1134 struct group *grp; |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1135 ngx_str_t *value; |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1136 |
| 517 | 1137 if (ccf->user != (uid_t) NGX_CONF_UNSET_UINT) { |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1138 return "is duplicate"; |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1139 } |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1140 |
| 455 | 1141 if (geteuid() != 0) { |
| 1142 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
| 1143 "the \"user\" directive makes sense only " | |
| 1144 "if the master process runs " | |
| 1145 "with super-user privileges, ignored"); | |
| 1146 return NGX_CONF_OK; | |
| 1147 } | |
| 1148 | |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1149 value = (ngx_str_t *) cf->args->elts; |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1150 |
| 473 | 1151 ccf->username = (char *) value[1].data; |
| 1152 | |
| 1288 | 1153 ngx_set_errno(0); |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
289
diff
changeset
|
1154 pwd = getpwnam((const char *) value[1].data); |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1155 if (pwd == NULL) { |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1156 ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno, |
| 452 | 1157 "getpwnam(\"%s\") failed", value[1].data); |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1158 return NGX_CONF_ERROR; |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1159 } |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1160 |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1161 ccf->user = pwd->pw_uid; |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1162 |
| 455 | 1163 group = (char *) ((cf->args->nelts == 2) ? value[1].data : value[2].data); |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1164 |
| 1288 | 1165 ngx_set_errno(0); |
| 455 | 1166 grp = getgrnam(group); |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1167 if (grp == NULL) { |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1168 ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno, |
| 455 | 1169 "getgrnam(\"%s\") failed", group); |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1170 return NGX_CONF_ERROR; |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1171 } |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1172 |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1173 ccf->group = grp->gr_gid; |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1174 |
|
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1175 return NGX_CONF_OK; |
|
278
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
270
diff
changeset
|
1176 |
|
0ba4821f4460
nginx-0.0.2-2004-03-04-10:04:55 import
Igor Sysoev <igor@sysoev.ru>
parents:
270
diff
changeset
|
1177 #endif |
|
234
cd71b95716b4
nginx-0.0.1-2004-01-20-23:40:08 import
Igor Sysoev <igor@sysoev.ru>
parents:
231
diff
changeset
|
1178 } |
| 473 | 1179 |
| 1180 | |
| 499 | 1181 static char * |
| 1069 | 1182 ngx_set_env(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
| 1183 { | |
| 1184 ngx_core_conf_t *ccf = conf; | |
| 1185 | |
| 1186 ngx_str_t *value, *var; | |
| 1187 ngx_uint_t i; | |
| 1188 | |
| 1189 var = ngx_array_push(&ccf->env); | |
| 1190 if (var == NULL) { | |
| 1191 return NGX_CONF_ERROR; | |
| 1192 } | |
| 1193 | |
| 1194 value = cf->args->elts; | |
| 1195 *var = value[1]; | |
| 1196 | |
| 1197 for (i = 0; i < value[1].len; i++) { | |
| 1198 | |
| 1199 if (value[1].data[i] == '=') { | |
| 1200 | |
| 1201 var->len = i; | |
| 1202 | |
| 1203 return NGX_CONF_OK; | |
| 1204 } | |
| 1205 } | |
| 1206 | |
| 1207 return NGX_CONF_OK; | |
| 1208 } | |
| 1209 | |
| 1210 | |
| 1211 static char * | |
| 499 | 1212 ngx_set_priority(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
| 473 | 1213 { |
| 1214 ngx_core_conf_t *ccf = conf; | |
| 1215 | |
| 1216 ngx_str_t *value; | |
| 1217 ngx_uint_t n, minus; | |
| 1218 | |
| 1219 if (ccf->priority != 0) { | |
| 1220 return "is duplicate"; | |
| 1221 } | |
| 1222 | |
| 1223 value = cf->args->elts; | |
| 1224 | |
| 1225 if (value[1].data[0] == '-') { | |
| 1226 n = 1; | |
| 1227 minus = 1; | |
| 1228 | |
| 1229 } else if (value[1].data[0] == '+') { | |
| 1230 n = 1; | |
| 1231 minus = 0; | |
| 1232 | |
| 1233 } else { | |
| 1234 n = 0; | |
| 1235 minus = 0; | |
| 1236 } | |
| 1237 | |
| 1238 ccf->priority = ngx_atoi(&value[1].data[n], value[1].len - n); | |
| 1239 if (ccf->priority == NGX_ERROR) { | |
| 1240 return "invalid number"; | |
| 1241 } | |
| 1242 | |
| 1243 if (minus) { | |
| 1244 ccf->priority = -ccf->priority; | |
| 1245 } | |
| 1246 | |
| 1247 return NGX_CONF_OK; | |
| 1248 } | |
| 577 | 1249 |
| 1250 | |
| 1251 static char * | |
| 1252 ngx_set_cpu_affinity(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 1253 { | |
|
4549
f31162fefe01
worker_cpu_affinity: cleaned up Linux implementation, added FreeBSD support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
1254 #if (NGX_HAVE_CPU_AFFINITY) |
| 577 | 1255 ngx_core_conf_t *ccf = conf; |
| 1256 | |
| 1257 u_char ch; | |
|
4549
f31162fefe01
worker_cpu_affinity: cleaned up Linux implementation, added FreeBSD support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
1258 uint64_t *mask; |
| 577 | 1259 ngx_str_t *value; |
| 1260 ngx_uint_t i, n; | |
| 1261 | |
| 1262 if (ccf->cpu_affinity) { | |
| 1263 return "is duplicate"; | |
| 1264 } | |
| 1265 | |
|
4549
f31162fefe01
worker_cpu_affinity: cleaned up Linux implementation, added FreeBSD support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
1266 mask = ngx_palloc(cf->pool, (cf->args->nelts - 1) * sizeof(uint64_t)); |
| 577 | 1267 if (mask == NULL) { |
| 1268 return NGX_CONF_ERROR; | |
| 1269 } | |
| 1270 | |
| 1271 ccf->cpu_affinity_n = cf->args->nelts - 1; | |
| 1272 ccf->cpu_affinity = mask; | |
| 1273 | |
| 1274 value = cf->args->elts; | |
| 1275 | |
| 1276 for (n = 1; n < cf->args->nelts; n++) { | |
| 1277 | |
|
4549
f31162fefe01
worker_cpu_affinity: cleaned up Linux implementation, added FreeBSD support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
1278 if (value[n].len > 64) { |
| 577 | 1279 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
4549
f31162fefe01
worker_cpu_affinity: cleaned up Linux implementation, added FreeBSD support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
1280 "\"worker_cpu_affinity\" supports up to 64 CPUs only"); |
| 577 | 1281 return NGX_CONF_ERROR; |
| 1282 } | |
| 1283 | |
| 1284 mask[n - 1] = 0; | |
| 1285 | |
| 1286 for (i = 0; i < value[n].len; i++) { | |
| 1287 | |
| 1288 ch = value[n].data[i]; | |
| 1289 | |
| 1290 if (ch == ' ') { | |
| 1291 continue; | |
| 1292 } | |
| 1293 | |
| 1294 mask[n - 1] <<= 1; | |
| 1295 | |
| 1296 if (ch == '0') { | |
| 1297 continue; | |
| 1298 } | |
| 1299 | |
| 1300 if (ch == '1') { | |
| 1301 mask[n - 1] |= 1; | |
| 1302 continue; | |
| 1303 } | |
| 1304 | |
| 1305 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1306 "invalid character \"%c\" in \"worker_cpu_affinity\"", | |
| 1307 ch); | |
| 2024 | 1308 return NGX_CONF_ERROR; |
| 577 | 1309 } |
| 1310 } | |
| 1311 | |
| 1312 #else | |
| 1313 | |
| 1314 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
| 1315 "\"worker_cpu_affinity\" is not supported " | |
| 1316 "on this platform, ignored"); | |
| 1317 #endif | |
| 1318 | |
| 1319 return NGX_CONF_OK; | |
| 1320 } | |
| 1321 | |
| 1322 | |
|
4549
f31162fefe01
worker_cpu_affinity: cleaned up Linux implementation, added FreeBSD support.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
1323 uint64_t |
| 577 | 1324 ngx_get_cpu_affinity(ngx_uint_t n) |
| 1325 { | |
| 1326 ngx_core_conf_t *ccf; | |
| 1327 | |
| 1328 ccf = (ngx_core_conf_t *) ngx_get_conf(ngx_cycle->conf_ctx, | |
| 1329 ngx_core_module); | |
| 1330 | |
| 1331 if (ccf->cpu_affinity == NULL) { | |
| 1332 return 0; | |
| 1333 } | |
| 1334 | |
| 1335 if (ccf->cpu_affinity_n > n) { | |
| 1336 return ccf->cpu_affinity[n]; | |
| 1337 } | |
| 1338 | |
| 1339 return ccf->cpu_affinity[ccf->cpu_affinity_n - 1]; | |
| 1340 } | |
|
4890
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1341 |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1342 |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1343 static char * |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1344 ngx_set_worker_processes(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1345 { |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1346 ngx_str_t *value; |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1347 ngx_core_conf_t *ccf; |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1348 |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1349 ccf = (ngx_core_conf_t *) conf; |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1350 |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1351 if (ccf->worker_processes != NGX_CONF_UNSET) { |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1352 return "is duplicate"; |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1353 } |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1354 |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1355 value = (ngx_str_t *) cf->args->elts; |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1356 |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1357 if (ngx_strcmp(value[1].data, "auto") == 0) { |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1358 ccf->worker_processes = ngx_ncpu; |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1359 return NGX_CONF_OK; |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1360 } |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1361 |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1362 ccf->worker_processes = ngx_atoi(value[1].data, value[1].len); |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1363 |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1364 if (ccf->worker_processes == NGX_ERROR) { |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1365 return "invalid value"; |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1366 } |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1367 |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1368 return NGX_CONF_OK; |
|
173cd5458281
Core: the "auto" parameter of the "worker_processes" directive.
Andrey Belov <defan@nginx.com>
parents:
4783
diff
changeset
|
1369 } |