Added command line option --version.

This commit is contained in:
Igor Sysoev
2017-08-24 17:29:57 +03:00
parent 259b90b9d7
commit 1e53ff184c
3 changed files with 19 additions and 6 deletions

View File

@@ -24,14 +24,14 @@ main(int argc, char **argv)
nxt_main_log.handler = nxt_log_time_handler; nxt_main_log.handler = nxt_log_time_handler;
nxt_log(&nxt_main_task, NXT_LOG_INFO, "nginext started");
ret = nxt_runtime_create(&nxt_main_task); ret = nxt_runtime_create(&nxt_main_task);
if (ret != NXT_OK) { if (ret != NXT_OK) {
return 1; return 1;
} }
nxt_log(&nxt_main_task, NXT_LOG_INFO, "nginext started");
nxt_event_engine_start(nxt_main_task.thread->engine); nxt_event_engine_start(nxt_main_task.thread->engine);
nxt_unreachable(); nxt_unreachable();

View File

@@ -10,6 +10,10 @@
#include <nxt_auto_config.h> #include <nxt_auto_config.h>
#define NXT_VERSION "0.1"
typedef struct nxt_port_s nxt_port_t; typedef struct nxt_port_s nxt_port_t;
typedef struct nxt_task_s nxt_task_t; typedef struct nxt_task_s nxt_task_t;
typedef struct nxt_port_recv_msg_s nxt_port_recv_msg_t; typedef struct nxt_port_recv_msg_s nxt_port_recv_msg_t;

View File

@@ -133,6 +133,10 @@ nxt_runtime_create(nxt_task_t *task)
rt->start = nxt_runtime_initial_start; rt->start = nxt_runtime_initial_start;
if (nxt_runtime_conf_init(task, rt) != NXT_OK) {
goto fail;
}
nxt_work_queue_add(&task->thread->engine->fast_work_queue, nxt_work_queue_add(&task->thread->engine->fast_work_queue,
nxt_runtime_start, task, rt, NULL); nxt_runtime_start, task, rt, NULL);
@@ -346,10 +350,6 @@ nxt_runtime_start(nxt_task_t *task, void *obj, void *data)
task->thread->log->ctx_handler = NULL; task->thread->log->ctx_handler = NULL;
task->thread->log->ctx = NULL; task->thread->log->ctx = NULL;
if (nxt_runtime_conf_init(task, rt) != NXT_OK) {
goto fail;
}
if (nxt_runtime_log_files_create(task, rt) != NXT_OK) { if (nxt_runtime_log_files_create(task, rt) != NXT_OK) {
goto fail; goto fail;
} }
@@ -797,6 +797,10 @@ nxt_runtime_conf_read_cmd(nxt_task_t *task, nxt_runtime_t *rt)
nxt_str_t addr; nxt_str_t addr;
nxt_sockaddr_t *sa; nxt_sockaddr_t *sa;
const static char version[] =
"nginext version: " NXT_VERSION "\n"
"configured as ./configure" NXT_CONFIGURE_OPTIONS "\n";
argv = nxt_process_argv; argv = nxt_process_argv;
while (*argv != NULL) { while (*argv != NULL) {
@@ -900,6 +904,11 @@ nxt_runtime_conf_read_cmd(nxt_task_t *task, nxt_runtime_t *rt)
rt->daemon = 0; rt->daemon = 0;
continue; continue;
} }
if (nxt_strcmp(p, "--version") == 0) {
write(STDERR_FILENO, version, sizeof(version) - 1);
exit(0);
}
} }
return NXT_OK; return NXT_OK;