diff options
| author | IWAMOTO Toshihiro <iwamoto@valinux.co.jp> | 2015-10-16 14:42:37 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-10-22 05:50:56 +0900 |
| commit | a9876bf5c4e0231ebf1657b80d1fbc5258edb035 (patch) | |
| tree | 5f25fdbfec5ba291a1abe88a8c229ca32846f72a | |
| parent | ff66183243b31f2acce34e1a421f2bcddc9aba78 (diff) | |
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>
| -rw-r--r-- | ryu/services/protocols/bgp/application.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ryu/services/protocols/bgp/application.py b/ryu/services/protocols/bgp/application.py index ed2454ff..82844447 100644 --- a/ryu/services/protocols/bgp/application.py +++ b/ryu/services/protocols/bgp/application.py @@ -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 |