technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

The discovery process did not quit if no modules were not found.

Browse Source
This commit is contained in:
Igor Sysoev
2017-08-30 03:18:56 +03:00
parent 55fe80600c
commit 740dc67ec8
1 changed files with 59 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nxt_application.c
View File

@@ -49,6 +49,9 @@ nxt_discovery_start(nxt_task_t *task, void *data)
rt = task->thread->runtime; rt = task->thread->runtime;
b = nxt_discovery_modules(task, rt->modules); b = nxt_discovery_modules(task, rt->modules);
if (nxt_slow_path(b == NULL)) {
exit(1);
}
main_port = rt->port_by_type[NXT_PROCESS_MAIN]; main_port = rt->port_by_type[NXT_PROCESS_MAIN];
@@ -97,9 +100,14 @@ nxt_discovery_modules(nxt_task_t *task, const char *path)
ret = glob(path, 0, NULL, &glb); ret = glob(path, 0, NULL, &glb);
if (ret == 0) {
n = glb.gl_pathc; n = glb.gl_pathc;
if (ret != 0) {
nxt_log(task, NXT_LOG_NOTICE,
"no modules matching: \"%s\" found", path);
n = 0;
}
modules = nxt_array_create(mp, n, sizeof(nxt_module_t)); modules = nxt_array_create(mp, n, sizeof(nxt_module_t));
if (modules == NULL) { if (modules == NULL) {
goto fail; goto fail;
@@ -150,7 +158,6 @@ nxt_discovery_modules(nxt_task_t *task, const char *path)
*p++ = ']'; *p++ = ']';
b->mem.free = p; b->mem.free = p;
}
fail: fail: