Change in vdsm[master]: detector

smizrahi at redhat.com smizrahi at redhat.com
Mon Jan 19 13:45:40 UTC 2015


Saggi Mizrahi has uploaded a new change for review.

Change subject: detector
......................................................................

detector

Change-Id: I1cad44312101853259ffc3d2b5907bbd314f61b0
Signed-off-by: Saggi Mizrahi <smizrahi at redhat.com>
---
M lib/yajsonrpc/betterAsyncore.py
M vdsm/protocoldetector.py
2 files changed, 9 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/37058/1

diff --git a/lib/yajsonrpc/betterAsyncore.py b/lib/yajsonrpc/betterAsyncore.py
index 66d4e89..f76267c 100644
--- a/lib/yajsonrpc/betterAsyncore.py
+++ b/lib/yajsonrpc/betterAsyncore.py
@@ -388,9 +388,6 @@
                     if interval is not None and interval >= 0:
                         timeout = min(interval, timeout)
 
-            if timeout is not None:
-                timeout *= 1000
-
             asyncore.loop(
                 use_poll=True,
                 map=self._map,
diff --git a/vdsm/protocoldetector.py b/vdsm/protocoldetector.py
index 0b8ff60..8acb003 100644
--- a/vdsm/protocoldetector.py
+++ b/vdsm/protocoldetector.py
@@ -38,6 +38,15 @@
     return sock.is_handshaking
 
 
+class _Acceptor(object):
+    def __init__(self, reactor, detectors, dispatcher):
+        self._detectors = detectors
+        self._reactor = reactor
+
+    def handle_accept(self, dispatcher):
+        dispatcher.socket.accept()
+
+
 class MultiProtocolAcceptor:
     """
     Provides multiple protocol support on a single port.


-- 
To view, visit http://gerrit.ovirt.org/37058
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1cad44312101853259ffc3d2b5907bbd314f61b0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi at redhat.com>


More information about the vdsm-patches mailing list