Merge "agent/linux: remove eventlet usage from of_monitor"
This commit is contained in:
@@ -13,9 +13,10 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
import queue
|
||||||
import re
|
import re
|
||||||
|
import threading
|
||||||
|
|
||||||
import eventlet
|
|
||||||
|
|
||||||
from neutron.agent.common import async_process
|
from neutron.agent.common import async_process
|
||||||
|
|
||||||
@@ -52,9 +53,11 @@ class OFMonitor(async_process.AsyncProcess):
|
|||||||
if start:
|
if start:
|
||||||
self.start()
|
self.start()
|
||||||
|
|
||||||
self._queue = eventlet.queue.Queue()
|
self._queue = queue.Queue()
|
||||||
eventlet.spawn(self._read_and_enqueue, self.iter_stdout)
|
threading.Thread(
|
||||||
eventlet.spawn(self._read_and_enqueue, self.iter_stderr)
|
target=self._read_and_enqueue, args=(self.iter_stdout,)).start()
|
||||||
|
threading.Thread(
|
||||||
|
target=self._read_and_enqueue, args=(self.iter_stderr,)).start()
|
||||||
|
|
||||||
def _read_and_enqueue(self, iter):
|
def _read_and_enqueue(self, iter):
|
||||||
for event_line in iter(block=True):
|
for event_line in iter(block=True):
|
||||||
|
Reference in New Issue
Block a user