summaryrefslogtreecommitdiffhomepage
path: root/bin/ryu-manager
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2013-04-25 16:05:50 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-05-01 22:18:39 +0900
commit9e6d3053c00b28a9ac9435b05e4987d9f8ce8843 (patch)
tree8b816b5729fad5edec235a73faf4f0438832c974 /bin/ryu-manager
parenta01972e18c8b7fe09bae45b43af8d234df96661a (diff)
sweep the tree to change from gevent to ryu.lib.hub
mostly mechanical changes. also, change the requirement from gevent to eventlet. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'bin/ryu-manager')
-rwxr-xr-xbin/ryu-manager11
1 files changed, 5 insertions, 6 deletions
diff --git a/bin/ryu-manager b/bin/ryu-manager
index d9cc8059..62188dea 100755
--- a/bin/ryu-manager
+++ b/bin/ryu-manager
@@ -16,9 +16,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import gevent
-from gevent import monkey
-monkey.patch_all()
+from ryu.lib import hub
+hub.patch()
# TODO:
# Right now, we have our own patched copy of ovs python bindings
@@ -69,16 +68,16 @@ def main():
services = []
ctlr = controller.OpenFlowController()
- thr = gevent.spawn_later(0, ctlr)
+ thr = hub.spawn(ctlr)
services.append(thr)
webapp = wsgi.start_service(app_mgr)
if webapp:
- thr = gevent.spawn_later(0, webapp)
+ thr = hub.spawn(webapp)
services.append(thr)
try:
- gevent.joinall(services)
+ hub.joinall(services)
finally:
app_mgr.close()