Fix tracer.

James William Pye · James William Pye · commit 92af32ee8721 · 2010-02-02T18:23:39.000-07:00
Got lost during the delegation of the protcol client.
diff --git a/postgresql/bin/pg_python.py b/postgresql/bin/pg_python.py
@@ -50,6 +50,10 @@ def command(argv = sys.argv):
 	else:
 		cat = None
 
+	trace_file = None
+	if co.pq_trace is not None:
+		trace_file = open(co.pq_trace, 'a')
+
 	try:
 		need_prompt = False
 		cond = None
@@ -67,6 +71,8 @@ def command(argv = sys.argv):
 					raise SystemExit(1)
 				connector = pg_driver.fit(category = cat, **cond)
 				connection = connector()
+				if trace_file is not None:
+					connection.tracer = trace_file.write
 				connection.connect()
 			except pg_exc.ClientCannotConnectError as err:
 				for att in connection.failures:
@@ -104,13 +110,8 @@ def command(argv = sys.argv):
 			builtins_d = __builtins__
 		restore = {k : builtins_d.get(k) for k in builtin_overload}
 
-		trace_file = None
-		if co.pq_trace is not None:
-			trace_file = open(co.pq_trace, 'a')
 		builtins_d.update(builtin_overload)
 		try:
-			if trace_file is not None:
-				connection.tracer = trace_file.write
 			with connection:
 				rv = pythonexec(
 					context = pycmd.postmortem(os.environ.get('PYTHON_POSTMORTEM'))
diff --git a/postgresql/driver/pq3.py b/postgresql/driver/pq3.py
@@ -1964,6 +1964,8 @@ def connect(self):
 				sf, self.connector._startup_parameters,
 				password = self.connector._password,
 			)
+			if hasattr(self, 'tracer'):
+				pq.tracer = self.tracer
 			# Grab the negotiation transaction before
 			# connecting as it will be needed later if successful.
 			neg = pq.xact

Original file line number	Diff line number	Diff line change
`@@ -1964,6 +1964,8 @@ def connect(self):`
`1964`	`1964`	`sf, self.connector._startup_parameters,`
`1965`	`1965`	`password = self.connector._password,`
`1966`	`1966`	`)`
	`1967`	`+ if hasattr(self, 'tracer'):`
	`1968`	`+ pq.tracer = self.tracer`
`1967`	`1969`	`# Grab the negotiation transaction before`
`1968`	`1970`	`# connecting as it will be needed later if successful.`
`1969`	`1971`	`neg = pq.xact`