TracyExtension: improved generated code

nette · Mar 11, 2019 · 0a2f7c2 · 0a2f7c2
1 parent 6a3dc0e
commit 0a2f7c2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Bridges/Nette/TracyExtension.php b/src/Bridges/Nette/TracyExtension.php
@@ -98,8 +98,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 			$initialize->addBody($builder->formatPhp('Tracy\Debugger::setLogger(?);', [$logger]));
 		}
 		if ($this->config['netteMailer'] && $builder->getByType(Nette\Mail\IMailer::class)) {
-			$initialize->addBody($builder->formatPhp('Tracy\Debugger::getLogger(?)->mailer = ?;', [
-				$logger,
+			$initialize->addBody($builder->formatPhp('Tracy\Debugger::getLogger()->mailer = ?;', [
 				[new Nette\DI\Statement(Tracy\Bridges\Nette\MailSender::class, ['fromEmail' => $this->config['fromEmail']]), 'send'],
 			]));
 		}
@@ -117,8 +116,9 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 				));
 			}
 
-			if (!$this->cliMode) {
-				$initialize->addBody('if ($tmp = $this->getByType("Nette\Http\Session", false)) { $tmp->start(); Tracy\Debugger::dispatch(); };');
+			if (!$this->cliMode && ($name = $builder->getByType(Nette\Http\Session::class))) {
+				$initialize->addBody('$this->getService(?)->isStarted() || $this->getService(?)->start();', [$name, $name]);
+				$initialize->addBody('Tracy\Debugger::dispatch();');
 			}
 		}