mirror of
https://github.com/faucetsdn/ryu.git
synced 2026-01-23 01:21:31 +01:00
Try logging.config.dictConfig before in-tree version
Python bundles dictConfig since 2.7. Try the bundled version first as the version included in Ryu will not work with python3. Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
parent
ff66183243
commit
a9876bf5c4
@ -45,10 +45,15 @@ from ryu.services.protocols.bgp.rtconf.common import REFRESH_STALEPATH_TIME
|
||||
from ryu.services.protocols.bgp.rtconf.common import ROUTER_ID
|
||||
from ryu.services.protocols.bgp.rtconf import neighbors
|
||||
from ryu.services.protocols.bgp.rtconf import vrfs
|
||||
from ryu.services.protocols.bgp.utils.dictconfig import dictConfig
|
||||
from ryu.services.protocols.bgp.utils.validation import is_valid_ipv4
|
||||
from ryu.services.protocols.bgp.operator import ssh
|
||||
|
||||
try:
|
||||
from logging.config import dictConfig
|
||||
except Exception:
|
||||
from ryu.services.protocols.bgp.utils.dictconfig import dictConfig
|
||||
|
||||
|
||||
LOG = logging.getLogger('bgpspeaker.application')
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user