summaryrefslogtreecommitdiffhomepage
path: root/bin
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2012-06-04 14:29:55 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2012-06-04 14:57:35 +0900
commit32cb6a21a06c5ee5689313a85df77d6b8ad485fd (patch)
treeb0b410072bd3186da52e03e37e817b274977883a /bin
parentcc8e3113295a8d48814955fa0e4783c85b1a561c (diff)
Replace wsapi
Ryu uses NOX's code based on twisted for web service. It's much cleaner to use webob since Ryu doesn't use twisted framework. Let's give up the NOX compatibility (incomplete) and go with the cleaner code. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Reviewed-by: Isaku Yamahata <yamahata@valinux.co.jp>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ryu-manager10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/ryu-manager b/bin/ryu-manager
index b1947680..2437275d 100755
--- a/bin/ryu-manager
+++ b/bin/ryu-manager
@@ -28,7 +28,7 @@ from ryu import log
log.early_init_log(logging.DEBUG)
from ryu import utils
-from ryu.app import wsapi
+from ryu.app import wsgi
from ryu.base.app_manager import AppManager
from ryu.controller import controller
@@ -58,10 +58,10 @@ def main():
thr = gevent.spawn_later(0, ctlr)
services.append(thr)
- # NOX webservice API
- ws = wsapi.wsapi()
- thr = gevent.spawn_later(0, ws)
- services.append(thr)
+ webapp = wsgi.start_service(app_mgr)
+ if webapp:
+ thr = gevent.spawn_later(0, webapp)
+ services.append(thr)
gevent.joinall(services)
app_mgr.close()