Merge branch 'master' of github.com:unbit/uwsgi

This commit is contained in:
Roberto De Ioris
2013-01-14 16:41:07 +01:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -268,7 +268,7 @@ void uwsgi_setup_workers() {
total_memory *= (uwsgi.numproc + uwsgi.master_process);
if (uwsgi.numproc > 0)
uwsgi_log("mapped %lu bytes (%lu KB) for %d cores\n", total_memory, total_memory / 1024, uwsgi.cores * uwsgi.numproc);
uwsgi_log("mapped %llu bytes (%llu KB) for %d cores\n", (unsigned long long) total_memory, (unsigned long long) (total_memory / 1024), uwsgi.cores * uwsgi.numproc);
}
+1
View File
@@ -1,3 +1,4 @@
#!./uwsgi --https :8443,foobar.crt,foobar.key --http-raw-body --gevent 100 --channel room001 --processes 4 --module tests.websocket
import uwsgi
import time