Added Redis cache/session support

diff --git a/composer.json b/composer.json
index 4a4c554a789a9ff00dd2255370a4773eb6d2b843..8f375a279bb2cb3de339dc0924dd51b461528ceb 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,8 @@
         "barryvdh/laravel-ide-helper": "^2.1",
         "barryvdh/laravel-debugbar": "^2.0",
         "league/flysystem-aws-s3-v3": "^1.0",
         "barryvdh/laravel-ide-helper": "^2.1",
         "barryvdh/laravel-debugbar": "^2.0",
         "league/flysystem-aws-s3-v3": "^1.0",

-        "barryvdh/laravel-dompdf": "0.6.*"
+        "barryvdh/laravel-dompdf": "0.6.*",
+        "predis/predis": "^1.0"

     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",
     },
     "require-dev": {
         "fzaninotto/faker": "~1.4",

diff --git a/composer.lock b/composer.lock
index 9951362c1c693ac7bbc206716677b7c2df102687..ec7a9486bcdd919353807208f35996e54f1c1a36 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],

-    "hash": "523e654de96df9259fa5dfcb583d6e3e",
-    "content-hash": "74b5601c253aab71cf55e0885f31ae7f",
+    "hash": "eb7c71e9ed116d3fd2a1d0af07f9f134",
+    "content-hash": "17d2d7fc5fed682f2a290d6588538035",

     "packages": [
         {
             "name": "aws/aws-sdk-php",
     "packages": [
         {
             "name": "aws/aws-sdk-php",


@@ -1759,6 +1759,56 @@
             ],
             "time": "2015-02-03 12:10:50"
         },
             ],
             "time": "2015-02-03 12:10:50"
         },

+        {
+            "name": "predis/predis",
+            "version": "v1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nrk/predis.git",
+                "reference": "84060b9034d756b4d79641667d7f9efe1aeb8e04"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nrk/predis/zipball/84060b9034d756b4d79641667d7f9efe1aeb8e04",
+                "reference": "84060b9034d756b4d79641667d7f9efe1aeb8e04",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "ext-curl": "Allows access to Webdis when paired with phpiredis",
+                "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Predis\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Daniele Alessandri",
+                    "email": "[email protected]",
+                    "homepage": "http://clorophilla.net"
+                }
+            ],
+            "description": "Flexible and feature-complete PHP client library for Redis",
+            "homepage": "http://github.com/nrk/predis",
+            "keywords": [
+                "nosql",
+                "predis",
+                "redis"
+            ],
+            "time": "2015-07-30 18:34:15"
+        },

         {
             "name": "psr/http-message",
             "version": "1.0",
         {
             "name": "psr/http-message",
             "version": "1.0",

diff --git a/config/cache.php b/config/cache.php
index 076a0299fc1196329d51875e8c64dbe678b7edc4..0a95683227fa02dd3ece50b75db2506e40d8574c 100644 (file)
--- a/config/cache.php
+++ b/config/cache.php
@@ -6,9 +6,8 @@ if (env('CACHE_DRIVER') === 'memcached') {
     $memcachedServers = explode(',', trim(env('MEMCACHED_SERVERS', '127.0.0.1:11211:100'), ','));
     foreach ($memcachedServers as $index => $memcachedServer) {
         $memcachedServerDetails = explode(':', $memcachedServer);
     $memcachedServers = explode(',', trim(env('MEMCACHED_SERVERS', '127.0.0.1:11211:100'), ','));
     foreach ($memcachedServers as $index => $memcachedServer) {
         $memcachedServerDetails = explode(':', $memcachedServer);

-        $components = count($memcachedServerDetails);
-        if ($components < 2) $memcachedServerDetails[] = '11211';
-        if ($components < 3) $memcachedServerDetails[] = '100';
+        if (count($memcachedServerDetails) < 2) $memcachedServerDetails[] = '11211';
+        if (count($memcachedServerDetails) < 3) $memcachedServerDetails[] = '100';

         $memcachedServers[$index] = array_combine($memcachedServerKeys, $memcachedServerDetails);
     }
 }
         $memcachedServers[$index] = array_combine($memcachedServerKeys, $memcachedServerDetails);
     }
 }


@@ -83,6 +82,6 @@ return [
     |
     */
 
     |
     */
 

-    'prefix' => 'laravel',
+    'prefix' => env('CACHE_PREFIX', 'bookstack'),

 
 ];
 
 ];

diff --git a/config/database.php b/config/database.php
index 9650de117ff98ad0c58c9087a32e670cc2eb3161..20d461fc9d7f265a2be1ebeb789d3114f6e96138 100644 (file)
--- a/config/database.php
+++ b/config/database.php
@@ -1,5 +1,21 @@
 <?php
 
 <?php
 

+// REDIS - Split out configuration into an array
+if (env('REDIS_SERVERS', false)) {
+    $redisServerKeys = ['host', 'port', 'database'];
+    $redisServers = explode(',', trim(env('REDIS_SERVERS', '127.0.0.1:6379:0'), ','));
+    $redisConfig = [
+        'cluster' => env('REDIS_CLUSTER', false)
+    ];
+    foreach ($redisServers as $index => $redisServer) {
+        $redisServerName = ($index === 0) ? 'default' : 'redis-server-' . $index;
+        $redisServerDetails = explode(':', $redisServer);
+        if (count($redisServerDetails) < 2) $redisServerDetails[] = '6379';
+        if (count($redisServerDetails) < 3) $redisServerDetails[] = '0';
+        $redisConfig[$redisServerName] = array_combine($redisServerKeys, $redisServerDetails);
+    }
+}
+

 return [
 
     /*
 return [
 
     /*


@@ -123,16 +139,6 @@ return [
     |
     */
 
     |
     */
 

-    'redis' => [
-
-        'cluster' => false,
-
-        'default' => [
-            'host'     => '127.0.0.1',
-            'port'     => 6379,
-            'database' => 0,
-        ],
-
-    ],
+    'redis' => $redisConfig,

 
 ];
 
 ];