Make sure auto start runs only once. Prevent tideways.load_library=1 …

…and composer auto start to interfere.
tideways · Mar 29, 2015 · bbefa7a · bbefa7a
1 parent 9590eb3
commit bbefa7a
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 14 deletions.
diff --git a/src/scripts/auto_start.php b/src/scripts/auto_start.php
@@ -1,20 +1,22 @@
 <?php
 
 /** Check for auto starting the Profiler in Web and CLI (via Env Variable) */
-if (ini_get("tideways.auto_start") || isset($_SERVER['TIDEWAYS_AUTO_START'])) {
-    if (php_sapi_name() !== "cli") {
-        /**
-         * In Web context we auto start with the framework transaction name
-         * configured in INI or ENV variable.
-         */
-        if (ini_get("tideways.transaction_function")) {
-            \Tideways\Profiler::detectFrameworkTransaction(ini_get("tideways.transaction_function"));
-        } else if (isset($_SERVER['TIDEWAYS_TRANSACTION_FUNCTION'])) {
-            \Tideways\Profiler::detectFrameworkTransaction($_SERVER['TIDEWAYS_TRANSACTION_FUNCTION']);
+if (ini_get("tideways.auto_start") || isset($_SERVER["TIDEWAYS_AUTO_START"])) {
+    if (\Tideways\Profiler::isStarted() === false) {
+        if (php_sapi_name() !== "cli") {
+            /**
+             * In Web context we auto start with the framework transaction name
+             * configured in INI or ENV variable.
+             */
+            if (ini_get("tideways.transaction_function")) {
+                \Tideways\Profiler::detectFrameworkTransaction(ini_get("tideways.transaction_function"));
+            } else if (isset($_SERVER['TIDEWAYS_TRANSACTION_FUNCTION'])) {
+                \Tideways\Profiler::detectFrameworkTransaction($_SERVER["TIDEWAYS_TRANSACTION_FUNCTION"]);
+            }
+            \Tideways\Profiler::start();
+        } else if (php_sapi_name() === "cli" && !empty($_SERVER["TIDEWAYS_SESSION"]) && isset($_SERVER['argv'])) {
+            \Tideways\Profiler::start();
+            \Tideways\Profiler::setTransactionName("cli:" . basename($_SERVER['argv'][0]));
         }
-        \Tideways\Profiler::start();
-    } else if (php_sapi_name() === "cli" && !empty($_SERVER['TIDEWAYS_SESSION'])) {
-        \Tideways\Profiler::start();
-        \Tideways\Profiler::setTransactionName("cli:" . basename($argv[0]));
     }
 }
diff --git a/tests/cli-autostart-test.php b/tests/cli-autostart-test.php
@@ -0,0 +1,22 @@
+<?php
+
+$_SERVER['TIDEWAYS_AUTO_START'] = 1;
+$_SERVER['TIDEWAYS_APIKEY'] = $argv[1];
+
+require_once __DIR__. '/../vendor/autoload.php';
+
+function bar() {
+}
+
+function foo() {
+    for ($i = 0; $i < 10; $i++) {
+        bar();
+    }
+}
+
+foo();
+if (\Tideways\Profiler::isStarted()) {
+    echo "Profiler started\n";
+} else {
+    echo "Profiler *NOT* started\n";
+}