Merge pull request #544 from NightJar/run-only-once-after-build

Run dev/build add-on only once
silverstripe · Jul 24, 2023 · 8286b64 · 8286b64
2 parents 5acba87 + ac6fdc2
commit 8286b64
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/_config/dataobject.yml b/_config/dataobject.yml
@@ -5,6 +5,3 @@ SilverStripe\ORM\DataObject:
   graphql_blacklisted_fields:
     LinkTracking: true
     FileTracking: true
-  extensions:
-    - SilverStripe\GraphQL\Extensions\DevBuildExtension
-
diff --git a/_config/dev.yml b/_config/dev.yml
@@ -1,6 +1,10 @@
 ---
 Name: graphql-dev
 ---
+SilverStripe\ORM\DatabaseAdmin:
+  extensions:
+    - SilverStripe\GraphQL\Extensions\DevBuildExtension
+
 SilverStripe\Dev\DevelopmentAdmin:
   registered_controllers:
     graphql:

diff --git a/src/Extensions/DevBuildExtension.php b/src/Extensions/DevBuildExtension.php
@@ -19,29 +19,25 @@ class DevBuildExtension extends DataExtension
      */
     private static bool $enabled = true;
 
-    private static bool $done = false;
-
     public function onAfterBuild(): void
     {
         if (!static::config()->get('enabled')) {
             return;
         }
-        if (!self::$done) {
-            // Get the current graphQL logger
-            $defaultLogger = Injector::inst()->get(LoggerInterface::class . '.graphql-build');
-
-            try {
-                // Define custom logger
-                $logger = Logger::singleton();
-                $logger->setVerbosity(Logger::INFO);
-                Injector::inst()->registerService($logger, LoggerInterface::class . '.graphql-build');
-
-                Build::singleton()->buildSchema();
-                self::$done = true;
-            } finally {
-                // Restore default logger back to its starting state
-                Injector::inst()->registerService($defaultLogger, LoggerInterface::class . '.graphql-build');
-            }
+
+        // Get the current graphQL logger
+        $defaultLogger = Injector::inst()->get(LoggerInterface::class . '.graphql-build');
+
+        try {
+            // Define custom logger
+            $logger = Logger::singleton();
+            $logger->setVerbosity(Logger::INFO);
+            Injector::inst()->registerService($logger, LoggerInterface::class . '.graphql-build');
+
+            Build::singleton()->buildSchema();
+        } finally {
+            // Restore default logger back to its starting state
+            Injector::inst()->registerService($defaultLogger, LoggerInterface::class . '.graphql-build');
         }
     }
 }