From b1a9d2d49762abfe7c43015d8440c1b978ace350 Mon Sep 17 00:00:00 2001 From: unbit Date: Sun, 13 Jan 2013 13:11:37 +0100 Subject: [PATCH 1/2] Update tests/websockets.py --- tests/websockets.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/websockets.py b/tests/websockets.py index 42eece10..c9a12ec4 100644 --- a/tests/websockets.py +++ b/tests/websockets.py @@ -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 From afc2e7dbe2d969e297a83251f7fe971b6a1a3e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 13 Jan 2013 14:57:07 +0100 Subject: [PATCH 2/2] fixed init log --- core/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/init.c b/core/init.c index 918428ea..0b14d8e8 100644 --- a/core/init.c +++ b/core/init.c @@ -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); }