diff --git a/core/uwsgi.c b/core/uwsgi.c index 13aad507..0884f370 100644 --- a/core/uwsgi.c +++ b/core/uwsgi.c @@ -2581,7 +2581,7 @@ int uwsgi_start(void *v_argv) { if (uwsgi.async > 1) { if ((unsigned long) uwsgi.max_fd < (unsigned long) uwsgi.async) { - uwsgi_log("- your current max open files limit is %lu, this is lower than requested async cores !!! -\n", (unsigned long) uwsgi.max_fd); + uwsgi_log_initial("- your current max open files limit is %lu, this is lower than requested async cores !!! -\n", (unsigned long) uwsgi.max_fd); uwsgi.rl.rlim_cur = uwsgi.async; uwsgi.rl.rlim_max = uwsgi.async; if (!setrlimit(RLIMIT_NOFILE, &uwsgi.rl)) { @@ -2593,7 +2593,7 @@ int uwsgi_start(void *v_argv) { uwsgi.async = (int) uwsgi.max_fd; } } - uwsgi_log("- async cores set to %d - fd table size: %d\n", uwsgi.async, (int) uwsgi.max_fd); + uwsgi_log_initial("- async cores set to %d - fd table size: %d\n", uwsgi.async, (int) uwsgi.max_fd); // optimization, this array maps file descriptor to requests uwsgi.async_waiting_fd_table = uwsgi_calloc(sizeof(struct wsgi_request *) * uwsgi.max_fd); uwsgi.async_proto_fd_table = uwsgi_calloc(sizeof(struct wsgi_request *) * uwsgi.max_fd); @@ -2604,16 +2604,16 @@ int uwsgi_start(void *v_argv) { #endif if (uwsgi.vhost) { - uwsgi_log("VirtualHosting mode enabled.\n"); + uwsgi_log_initial("VirtualHosting mode enabled.\n"); } // setup locking uwsgi_setup_locking(); if (uwsgi.use_thunder_lock) { - uwsgi_log("thunder lock: enabled\n"); + uwsgi_log_initial("thunder lock: enabled\n"); } else { - uwsgi_log("thunder lock: disabled (you can enable it with --thunder-lock)\n"); + uwsgi_log_initial("thunder lock: disabled (you can enable it with --thunder-lock)\n"); } // allocate rpc structures diff --git a/plugins/pty/pty.c b/plugins/pty/pty.c index ac5a409c..a86efd4c 100644 --- a/plugins/pty/pty.c +++ b/plugins/pty/pty.c @@ -77,8 +77,8 @@ static struct uwsgi_option uwsgi_pty_options[] = { {"pty-socket", required_argument, 0, "bind the pty server on the specified address", uwsgi_opt_set_str, &upty.addr, 0}, {"pty-log", no_argument, 0, "send stdout/stderr to the log engine too", uwsgi_opt_true, &upty.log, 0}, {"pty-input", no_argument, 0, "read from original stdin in addition to pty", uwsgi_opt_true, &upty.input, 0}, - {"pty-connect", required_argument, 0, "connect the current terminal to a pty server", uwsgi_opt_set_str, &upty.remote, 0}, - {"pty-uconnect", required_argument, 0, "connect the current terminal to a pty server (using uwsgi protocol)", uwsgi_opt_set_str, &upty.uremote, 0}, + {"pty-connect", required_argument, 0, "connect the current terminal to a pty server", uwsgi_opt_set_str, &upty.remote, UWSGI_OPT_NO_INITIAL}, + {"pty-uconnect", required_argument, 0, "connect the current terminal to a pty server (using uwsgi protocol)", uwsgi_opt_set_str, &upty.uremote, UWSGI_OPT_NO_INITIAL}, {"pty-no-isig", no_argument, 0, "disable ISIG terminal attribute in client mode", uwsgi_opt_true, &upty.no_isig, 0}, {"pty-exec", required_argument, 0, "run the specified command soon after the pty thread is spawned", uwsgi_opt_set_str, &upty.command, 0}, {0, 0, 0, 0, 0, 0, 0},