remove greenlib depenencies, and squelch exceptions in switch_out
This commit is contained in:
@@ -28,7 +28,6 @@ THE SOFTWARE.
|
||||
import socket
|
||||
import sys
|
||||
from code import InteractiveConsole
|
||||
from eventlet import greenlib
|
||||
|
||||
from eventlet import api
|
||||
from eventlet.support import greenlets
|
||||
|
@@ -123,7 +123,10 @@ class BaseHub(object):
|
||||
cur = greenlet.getcurrent()
|
||||
switch_out = getattr(cur, 'switch_out', None)
|
||||
if switch_out is not None:
|
||||
switch_out()
|
||||
try:
|
||||
switch_out()
|
||||
except:
|
||||
traceback.print_exception(*sys.exc_info())
|
||||
if self.greenlet.dead:
|
||||
self.greenlet = greenlet.greenlet(self.run)
|
||||
try:
|
||||
|
@@ -29,7 +29,6 @@ import errno
|
||||
import traceback
|
||||
import time
|
||||
|
||||
from eventlet import greenlib
|
||||
from eventlet.timer import Timer
|
||||
from eventlet.hubs import hub
|
||||
|
||||
|
@@ -49,8 +49,7 @@ except ImportError:
|
||||
def g_log(*args):
|
||||
import sys
|
||||
from eventlet.support import greenlets as greenlet
|
||||
from eventlet.greenlib import greenlet_id
|
||||
g_id = greenlet_id()
|
||||
g_id = id(greenlet.getcurrent())
|
||||
if g_id is None:
|
||||
if greenlet.getcurrent().parent is None:
|
||||
ident = 'greenlet-main'
|
||||
|
Reference in New Issue
Block a user