JoyAndJava
diff --git a/‎src/Panel/SqlLogPanel.php‎
Lines changed: 7 additions & 3 deletions b/‎src/Panel/SqlLogPanel.php‎
Lines changed: 7 additions & 3 deletions
diff --git a/‎tests/TestCase/Panel/SqlLogPanelTest.php‎
Lines changed: 23 additions & 4 deletions b/‎tests/TestCase/Panel/SqlLogPanelTest.php‎
Lines changed: 23 additions & 4 deletions
@@ -53,10 +53,14 @@ public function initialize(Event $event) {
 				$logger = $connection->logger();
 			}
 
-			$spy = new DebugLog($logger, $name);
-			$this->_loggers[] = $spy;
+			if ($logger instanceof DebugLog) {
+				continue;
+			}
+			$logger = new DebugLog($logger, $name);
+
 			$connection->logQueries(true);
-			$connection->logger($spy);
+			$connection->logger($logger);
+			$this->_loggers[] = $logger;
 		}
 	}
 
 
@@ -13,6 +13,7 @@
 namespace DebugKit\Test\TestCase\Panel;
 
 use Cake\Controller\Controller;
+use Cake\Datasource\ConnectionManager;
 use Cake\Event\Event;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
@@ -40,22 +41,40 @@ public function setUp() {
 		$this->panel = new SqlLogPanel();
 	}
 
+/**
+ * Ensure that subrequests don't double proxy the logger.
+ *
+ * @return void
+ */
+	public function testInitializeTwiceNoDoubleProxy() {
+		$event = new Event('Sample');
+
+		$this->panel->initialize($event);
+		$db = ConnectionManager::get('test');
+		$logger = $db->logger();
+		$this->assertInstanceOf('DebugKit\Database\Log\DebugLog', $logger);
+
+		$this->panel->initialize($event);
+		$second = $db->logger();
+		$this->assertSame($second, $logger);
+
+		$this->assertCount(2, $this->panel->data()['loggers']);
+	}
+
 /**
  * test the parsing of source list.
  *
  * @return void
  */
 	public function testData() {
 		$event = new Event('Sample');
-		$result = $this->panel->initialize($event);
+		$this->panel->initialize($event);
 
 		$articles = TableRegistry::get('Articles');
 		$articles->findById(1)->first();
 
 		$result = $this->panel->data();
-
 		$this->assertArrayHasKey('loggers', $result);
-		$this->assertCount(3, $result['loggers']);
 	}
 
 /**
@@ -71,7 +90,7 @@ public function testSummary() {
 		$articles->findById(1)->first();
 
 		$result = $this->panel->summary();
-		$this->assertRegExp('/1 - \d+ ms/', $result);
+		$this->assertRegExp('/\d+ - \d+ ms/', $result);
 	}
 
 }
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,14 @@ public function initialize(Event $event) {`
`53`	`53`	`$logger = $connection->logger();`
`54`	`54`	`}`
`55`	`55`
`56`		`- $spy = new DebugLog($logger, $name);`
`57`		`- $this->_loggers[] = $spy;`
	`56`	`+ if ($logger instanceof DebugLog) {`
	`57`	`+ continue;`
	`58`	`+ }`
	`59`	`+ $logger = new DebugLog($logger, $name);`
	`60`	`+`
`58`	`61`	`$connection->logQueries(true);`
`59`		`- $connection->logger($spy);`
	`62`	`+ $connection->logger($logger);`
	`63`	`+ $this->_loggers[] = $logger;`
`60`	`64`	`}`
`61`	`65`	`}`
`62`	`66`