correct fix for the bug

Exa-Networks · Sep 27, 2013 · ea49dcb · ea49dcb
1 parent 3477c5e
commit ea49dcb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -3,6 +3,9 @@ Version explained:
  minor : increase on risk of code breakage during a major release
  bug   : increase on bug or incremental changes
 
+Version 3.2.15
+ * Fix: a wrong fix introducing a bug in 3.2.14
+
 Version 3.2.14
  * Fix: do not leak route between peers
  * Fix: restore group level static group for all peers thereafter

diff --git a/lib/exabgp/configuration/file.py b/lib/exabgp/configuration/file.py
@@ -2559,7 +2559,7 @@ def decode (self,update):
 			for number in range(len(update.nlris)):
 				change = Change(update.nlris[number],update.attributes)
 				self.logger.parser('decoded %s %s %s' % (decoding,change.nlri.action,change.extensive()))
-			self.logger.parser('update json %s' % JSON('1.0').update(n,update))
+			self.logger.parser('update json %s' % JSON('1.0').update(str(n.peer_address),update))
 		import sys
 		sys.exit(0)
 

diff --git a/lib/exabgp/reactor/api/encoding.py b/lib/exabgp/reactor/api/encoding.py
@@ -116,7 +116,7 @@ def _neighbor (self,neighbor,content):
 		'"neighbor": { ' \
 			'"ip": "%s", ' \
 			'%s' \
-		'} '% (str(neighbor.peer_address),content)
+		'} '% (neighbor,content)
 
 	def _bmp (self,neighbor,content):
 		return \