fixed poll() usage

This commit is contained in:
roberto@sirius
2010-12-16 18:25:33 +01:00
parent 26cae83139
commit da577ef923
2 changed files with 20 additions and 2 deletions
+6 -2
View File
@@ -423,7 +423,7 @@ void master_loop(char **argv, char **environ) {
}
else {
#endif
rlen = poll(uwsgi_signal_poll, uwsgi.numproc, check_interval);
rlen = poll(uwsgi_signal_poll, uwsgi.numproc, check_interval*1000);
if (rlen < 0) {
uwsgi_error("poll()");
continue;
@@ -560,10 +560,14 @@ void master_loop(char **argv, char **environ) {
uwsgi_cluster_add_me();
}
continue;
#endif
// now check for lb pool
continue;
}
#ifdef UWSGI_SPOOLER
/* reload the spooler */
+14
View File
@@ -844,6 +844,20 @@ struct uwsgi_server {
void *user_lock;
};
struct uwsgi_lb_group {
char name[101];
int kind;
}
struct uwsgi_lb_node {
char name[101];
int group;
uint64_t hits;
time_t last_choosen;
}
#define CLUSTER_NODE_STATIC 0
#define CLUSTER_NODE_DYNAMIC 1