Merge pull request #7 from mhh1422/master

Add TTL to es documents

Author: mhh1422

README.md

@@ -23,11 +23,11 @@ An elastic-search based session driver for Laravel 5.1
     "elastic" => [
         "url" => "http://localhost:9200/",
         "index" => "laravel-es-sessions",
-        "type" => "session",
-        'ttl' => '15m' //check https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-ttl-field.html#_default_ttl
+        "type" => "session"
     ],
+    "lifetime" => 30
     ```
-    Values shown above are the default values in case you did not configure.
+    Values shown above for elastic parameter are the default values in case you did not configure.
 
 ##Index/Type mapping
 Elastic will detect the mapping by default, however, it is recommended to set the mapping explicitly.
@@ -46,7 +46,7 @@ You can do so manually by applying this mapping to the index and type:
         },
         "_ttl":{
             "enabled":true,
-            "default":"15m"
+            "default":"30m"
         }
     }
 }
@@ -58,6 +58,9 @@ Or simpler, the package can do it for you. You will need to tinker `./artisan ti
 \ItvisionSy\LaravelElasticSessionDriver\ElasticSessionStore::putMapping();
 ```
 
+Please note that the `putMapping()` method will automatically read the values from your sessions config file 
+including the `session.lifetime` value (in minutes) which will be used as the default TTL value.
+
 ## Author
 Muhannad Shelleh <[email protected]>
 

src/ElasticSessionStore.php

@@ -35,6 +35,7 @@ public function __construct(array $sessionConfig) {
 
     public static function putMapping() {
         $config = config('session.elastic', static::$defaultConfig);
+        $ttl = $this->getTTL();
         $client = new \Elasticsearch\Client(['hosts' => [$config['url']]]);
         $mappingParams = [
             'index' => $config['index'],
@@ -45,7 +46,7 @@ public static function putMapping() {
                     'updated' => ['type' => 'date'],
                     'data' => ['type' => 'string', 'index' => 'no'],
                 ],
-                '_ttl' => (@$config['ttl'] ? ['enabled' => true, 'default' => @$config['ttl']? : '15m'] : ['enabled' => false])
+                '_ttl' => ($ttl ? ['enabled' => true, 'default' => $ttl? : '30m'] : ['enabled' => false])
             ]
         ];
         $client->indices()->putMapping($mappingParams);
@@ -75,7 +76,8 @@ public function read($sessionId) {
     public function write($sessionId, $sessionData) {
         $updatedTs = Carbon::now()->toIso8601String();
         $createdTs = array_key_exists($sessionId, $this->_cache) ? $this->_cache[$sessionId]->created : $updatedTs;
-        static::create(['data' => $sessionData, 'created' => $createdTs, 'updated' => $updatedTs, '_ttl' => config('session.elastic.ttl', '15m')], $sessionId, ["api" => "index"]);
+        $ttl = $this->getTTL();
+        static::create(['data' => $sessionData, 'created' => $createdTs, 'updated' => $updatedTs] + ($ttl ? ['_ttl' => $ttl] : []), $sessionId, ["api" => "index"]);
     }
 
     public function destroy($sessionId) {
@@ -94,4 +96,10 @@ public function type() {
         return $this->sessionConfig['type'];
     }
 
+    protected function getTTL() {
+        $ttl = config('session.lifetime', 30);
+        $ttl.=$ttl ? 'm' : '';
+        return !!$ttl ? $ttl : false;
+    }
+
 }