diff options
| -rw-r--r-- | auto/summary | 10 | ||||
| -rw-r--r-- | src/nxt_main_process.c | 9 |
2 files changed, 10 insertions, 9 deletions
diff --git a/auto/summary b/auto/summary index a45855d6..6af23a8d 100644 --- a/auto/summary +++ b/auto/summary @@ -7,12 +7,12 @@ cat << END Configuration summary: - unit pid file: "$NXT_PID" - unit log file: "$NXT_LOG" - unit modules path: "$NXT_MODULES" - unit state path: "$NXT_STATE" + unit pid file: "$NXT_PID" + unit log file: "$NXT_LOG" + unit modules path: "$NXT_MODULES" + unit state path: "$NXT_STATE" - unit control API socket: "$NXT_CONTROL" + unit control API socket: "$NXT_CONTROL" non-privileged user: "$NXT_USER" non-privileged group: "$NXT_GROUP" diff --git a/src/nxt_main_process.c b/src/nxt_main_process.c index 7f39cc1d..7de643ca 100644 --- a/src/nxt_main_process.c +++ b/src/nxt_main_process.c @@ -322,11 +322,12 @@ nxt_main_start_controller_process(nxt_task_t *task, nxt_runtime_t *rt) file.name = (nxt_file_name_t *) rt->conf; - if (nxt_file_open(task, &file, NXT_FILE_RDONLY, NXT_FILE_OPEN, 0) == NXT_OK) { + ret = nxt_file_open(task, &file, NXT_FILE_RDONLY, NXT_FILE_OPEN, 0); - if (nxt_fast_path(nxt_file_info(&file, &fi) == NXT_OK - && nxt_is_file(&fi))) - { + if (ret == NXT_OK) { + ret = nxt_file_info(&file, &fi); + + if (nxt_fast_path(ret == NXT_OK && nxt_is_file(&fi))) { conf.length = nxt_file_size(&fi); conf.start = nxt_malloc(conf.length); |