fix --wsgi-file and --pythonpath cooperation

This commit is contained in:
roberto@fiorenzo
2010-09-27 17:05:58 +02:00
parent fb73324d25
commit 6cebf19468
3 changed files with 18 additions and 13 deletions
+14
View File
@@ -1,5 +1,19 @@
#include "uwsgi.h"
#ifdef __linux__
void get_linux_tcp_info(int fd) {
struct tcp_info ti;
socklen_t tis = sizeof(struct tcp_info) ;
if (!getsockopt(fd, IPPROTO_TCP, TCP_INFO, &ti, &tis)) {
if (ti.tcpi_unacked >= ti.tcpi_sacked) {
uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%d/%d) ***\n", fd, ti.tcpi_unacked, ti.tcpi_sacked);
}
}
}
#endif
void master_loop(struct uwsgi_server *uwsgi, char **argv, char **environ) {
uint64_t master_cycles = 0;
+4
View File
@@ -475,6 +475,10 @@ void sanitize_args(struct uwsgi_server *uwsgi) {
uwsgi->single_interpreter = 1 ;
}
if (uwsgi->wsgi_file) {
uwsgi->single_interpreter = 1 ;
}
#ifdef UWSGI_INI
if (uwsgi->ini) {
uwsgi->single_interpreter = 1 ;
-13
View File
@@ -177,19 +177,6 @@ static struct option long_options[] = {
{0, 0, 0, 0}
};
#ifdef __linux__
void get_linux_tcp_info(int fd) {
struct tcp_info ti;
socklen_t tis = sizeof(struct tcp_info) ;
if (!getsockopt(fd, IPPROTO_TCP, TCP_INFO, &ti, &tis)) {
if (ti.tcpi_unacked >= ti.tcpi_sacked) {
uwsgi_log_verbose("*** uWSGI listen queue of socket %d full !!! (%d/%d) ***\n", fd, ti.tcpi_unacked, ti.tcpi_sacked);
}
}
}
#endif
void ping(struct uwsgi_server *uwsgi) {
struct uwsgi_header uh;