[IM] rework position of logging for greater accuracy in measurements

.env.dev

@@ -292,5 +292,6 @@ IXP_IRRDB_BGPQ3_PATH=/usr/local/bin/bgpq3
 # PEERINGDB_OAUTH_CLIENT_SECRET="xxx"
 # PEERINGDB_OAUTH_REDIRECT="https://www.example.com/auth/login/peeringdb/callback"
 
+2FA_ENABLED=false
 
 

app/Console/Commands/Router/GenerateConfiguration.php

@@ -22,6 +22,8 @@
  *
  * http://www.gnu.org/licenses/gpl-2.0.html
  */
+
+use Illuminate\Support\Facades\Log;
 use IXP\Console\Commands\Command;
 
 use IXP\Models\Router;
@@ -69,6 +71,12 @@ public function handle()
         }
 
         echo ( new RouterConfigurationGenerator( $router ) )->render();
+
+        Log::info( sprintf( "Generated router configuration for %s and used %0.1f MB ( %0.1f MB real) of memory in %0.3f seconds.",
+                $router->handle, memory_get_peak_usage()/1024/1024, memory_get_peak_usage( true )/1024/1024,
+                microtime(true) - LARAVEL_START )
+        );
+
         return 0;
     }
 }

app/Http/Controllers/Api/V4/RouterController.php

@@ -25,6 +25,7 @@
 
 use Carbon\Carbon;
 
+use Illuminate\Support\Facades\App;
 use IXP\Models\Router;
 
 use IXP\Tasks\Router\ConfigurationGenerator as RouterConfigurationGenerator;
@@ -63,9 +64,14 @@ public function genConfig( string $handle ): Response
             abort( 404, "Unknown router handle" );
         }
 
-        $configView = ( new RouterConfigurationGenerator( $router ) )->render();
+        $configView = ( new RouterConfigurationGenerator( $router ) )->render()->render();
 
-        return response( $configView->render(), 200 )
+        \Illuminate\Support\Facades\Log::info( sprintf( "Generated router configuration for %s and used %0.1f MB ( %0.1f MB real) of memory in %0.3f seconds.",
+                $router->handle, memory_get_peak_usage() / 1024 / 1024, memory_get_peak_usage( true ) / 1024 / 1024,
+                microtime( true ) - LARAVEL_START )
+        );
+
+        return response( $configView, 200 )
                 ->header('Content-Type', 'text/plain; charset=utf-8');
     }
 

app/Tasks/Router/ConfigurationGenerator.php

@@ -108,11 +108,6 @@ public function render(): ViewContract
             ]
         );
 
-        Log::info( sprintf( "Generated router configuration for %s and used %0.1f MB ( %0.1f MB real) of memory in %0.3f seconds.",
-            $this->router()->handle, memory_get_peak_usage()/1024/1024, memory_get_peak_usage( true )/1024/1024,
-            microtime(true) - LARAVEL_START )
-        );
-
         return $v;
     }
 }

artisan

@@ -1,7 +1,9 @@
 #!/usr/bin/env php
 <?php
 
-define('LARAVEL_START', microtime(true));
+if( !defined('LARAVEL_START') ) {
+    define('LARAVEL_START', microtime(true));
+}
 
 /*
 |--------------------------------------------------------------------------

tests/TestCase.php

@@ -48,7 +48,11 @@ abstract class TestCase extends BaseTestCase
     public function __construct( $name = null, array $data = [], $dataName = '' )
     {
         date_default_timezone_set('Europe/Dublin');
-        define( 'LARAVEL_START', microtime(true ) );
+
+        if( !defined('LARAVEL_START') ) {
+            define( 'LARAVEL_START', microtime(true ) );
+        }
+
         parent::__construct( $name, $data, $dataName );
     }