diff --git a/core/daemons.c b/core/daemons.c index b4039c19..aa84c289 100644 --- a/core/daemons.c +++ b/core/daemons.c @@ -233,7 +233,7 @@ void uwsgi_detach_daemons() { #endif uwsgi_log("[uwsgi-daemons] stopping daemon (pid: %d): %s\n", (int) ud->pid, ud->command); // try to gracefully stop daemon, kill it if it won't die - // if mercy is not set than wait up to 3 seconds + // if mercy is not set then wait up to 3 seconds time_t timeout = uwsgi_now() + (uwsgi.reload_mercy ? uwsgi.reload_mercy : 3); int waitpid_status; while (!kill(ud->pid, 0)) { @@ -241,7 +241,7 @@ void uwsgi_detach_daemons() { sleep(1); waitpid(-ud->pid, &waitpid_status, WNOHANG); if (uwsgi_now() >= timeout) { - uwsgi_log("[uwsgi-daemons] daemon did not died in time, killing (pid: %d): %s\n", (int) ud->pid, ud->command); + uwsgi_log("[uwsgi-daemons] daemon did not die in time, killing (pid: %d): %s\n", (int) ud->pid, ud->command); kill(-ud->pid, SIGKILL); break; } diff --git a/core/io.c b/core/io.c index fe720098..2b27ff51 100644 --- a/core/io.c +++ b/core/io.c @@ -270,7 +270,7 @@ static char *uwsgi_scheme_emperor(char *url, size_t *size, int add_zero) { } rlen = read(uwsgi.emperor_fd_config, ptr, remains); if (rlen <= 0) { - uwsgi_log("[uwsgi-vassal] error reading config header from !!!\n", url); + uwsgi_log("[uwsgi-vassal] error reading config header from %s !!!\n", url); exit(1); } ptr+=rlen; @@ -293,7 +293,7 @@ static char *uwsgi_scheme_emperor(char *url, size_t *size, int add_zero) { } rlen = read(uwsgi.emperor_fd_config, ptr, remains); if (rlen <= 0) { - uwsgi_log("[uwsgi-vassal] error reading config from !!!\n", url); + uwsgi_log("[uwsgi-vassal] error reading config from %s !!!\n", url); exit(1); } ptr+=rlen; diff --git a/core/logging.c b/core/logging.c index 3a0b8f37..77a9c3d5 100644 --- a/core/logging.c +++ b/core/logging.c @@ -1853,7 +1853,7 @@ void uwsgi_log_encoder_parse_vars(struct uwsgi_log_encoder *ule) { /* // format: foo ${var} bar msg (the logline) - msgnl (the logine with newline) + msgnl (the logline with newline) unix (the time_t value) micros (current microseconds) strftime (strftime) diff --git a/core/utils.c b/core/utils.c index fdf431f4..a9dc82b8 100644 --- a/core/utils.c +++ b/core/utils.c @@ -726,7 +726,7 @@ void uwsgi_as_root() { uwsgi_foreach(usl, uwsgi.call_as_root) { if (uwsgi_call_symbol(usl->value)) { - uwsgi_log("unaable to call function \"%s\"\n", usl->value); + uwsgi_log("unable to call function \"%s\"\n", usl->value); } } @@ -944,7 +944,7 @@ void uwsgi_as_root() { uwsgi_foreach(usl, uwsgi.call_as_user) { if (uwsgi_call_symbol(usl->value)) { - uwsgi_log("unaable to call function \"%s\"\n", usl->value); + uwsgi_log("unable to call function \"%s\"\n", usl->value); exit(1); } } diff --git a/core/uwsgi.c b/core/uwsgi.c index c0cdaa03..8a411913 100644 --- a/core/uwsgi.c +++ b/core/uwsgi.c @@ -1456,7 +1456,7 @@ void uwsgi_exec_atexit(void) { uwsgi_foreach(usl, uwsgi.call_as_user_atexit) { if (uwsgi_call_symbol(usl->value)) { - uwsgi_log("unaable to call function \"%s\"\n", usl->value); + uwsgi_log("unable to call function \"%s\"\n", usl->value); } } } @@ -3529,7 +3529,7 @@ void uwsgi_init_all_apps() { uwsgi_foreach(usl, uwsgi.call_pre_app) { if (uwsgi_call_symbol(usl->value)) { - uwsgi_log("unaable to call function \"%s\"\n", usl->value); + uwsgi_log("unable to call function \"%s\"\n", usl->value); exit(1); } } @@ -3597,7 +3597,7 @@ void uwsgi_init_all_apps() { uwsgi_foreach(usl, uwsgi.call_post_app) { if (uwsgi_call_symbol(usl->value)) { - uwsgi_log("unaable to call function \"%s\"\n", usl->value); + uwsgi_log("unable to call function \"%s\"\n", usl->value); } }