DP-193 Added instance ID to configuration tab for easy reference

composer.json

@@ -17,16 +17,8 @@
   ],
   "authors":     [
     {
-      "name":  "Arif Islam",
-      "email": "[email protected]"
-    },
-    {
-      "name": "Charles Harmon",
-      "email": "[email protected]"
-    },
-    {
-      "name":  "Lee Hicks",
-      "email": "[email protected]"
+      "name":  "DreamFactory Development Team",
+      "email": "[email protected]"
     }
   ],
   "support":     {

src/Models/InstanceId.php

@@ -32,4 +32,21 @@ public static function generateInstanceId() {
 
         return $model;
     }
+
+    /**
+     * Returns InstanceId info cached, or reads from db if not present.
+     * Pass in an id.
+     *
+     * @return string|null
+     */
+    public static function getCachedInstanceId()
+    {
+        $cacheKey = 'instance:id';
+        $result = \Cache::remember($cacheKey, \Config::get('df.default_cache_ttl'), function () {
+            return self::getInstanceIdOrGenerate();
+        });
+
+        return is_null($result) ? null : $result;
+    }
+
 }

src/Testing/TestCase.php

@@ -114,7 +114,7 @@ public function stage()
      */
     public function createApplication()
     {
-        $app = require __DIR__ . '/../../../../../bootstrap/app.php';
+        $app = require '/opt/dreamfactory/bootstrap/app.php';
 
         $app->make('Illuminate\Contracts\Console\Kernel')->bootstrap();
 

src/Utility/Environment.php

@@ -54,7 +54,7 @@ public static function getDreamFactoryInstanceId()
     {
         $instanceID = '';
         try {
-            $instanceID = InstanceId::first()->instance_id;
+            $instanceID = InstanceId::getCachedInstanceId();
         } catch (\Exception $e) {
             $instanceID = "Not Found";
         }