Merge branch 'master' of https://github.com/basemkhirat/elasticsearch

Author: basemkhirat

composer.json

@@ -39,10 +39,11 @@
     },
     "require": {
         "php": ">=5.6.6",
-        "elasticsearch/elasticsearch": "^5.0",
+        "elasticsearch/elasticsearch": "^5.0|^6.0",
         "illuminate/pagination": "*",
         "illuminate/support": "*",
-        "symfony/var-dumper": "*"
+        "symfony/var-dumper": "*",
+        "monolog/monolog": "^1.23"
     },
     "require-dev": {
         "phpunit/phpunit": "5.7.0"

readme.md

@@ -126,6 +126,12 @@ $connection = Connection::create([
 	// 'handler' => new MyCustomHandler(),
 
     'index' => 'my_index',
+    
+    'logging' => [
+        'enabled'   => env('ELASTIC_LOGGING_ENABLED',false),
+        'level'     => env('ELASTIC_LOGGING_LEVEL','all'),
+        'location'  => env('ELASTIC_LOGGING_LOCATION',base_path('storage/logs/elasticsearch.log'))
+    ],  
 ]);
 
 

src/Connection.php

@@ -64,6 +64,8 @@ public static function create($config)
 
         $clientBuilder->setHosts($config["servers"]);
 
+        $clientBuilder = self::configureLogging($clientBuilder,$config);
+
         $query = new Query($clientBuilder->build());
 
         if (array_key_exists("index", $config) and $config["index"] != "") {
@@ -103,6 +105,8 @@ function connection($name)
 
             $clientBuilder->setHosts($config["servers"]);
 
+            $clientBuilder = self::configureLogging($clientBuilder,$config);
+
             if (!empty($config['handler'])) {
                 $clientBuilder->setHandler($config['handler']);
             }
@@ -121,6 +125,21 @@ function connection($name)
     }
 
 
+    /**
+     * @param ClientBuilder $clientBuilder
+     * @param array $config
+     * @return ClientBuilder
+     */
+    public static function configureLogging(ClientBuilder $clientBuilder, array $config)
+    {
+        if (array_get($config,'logging.enabled')) {
+            $logger = ClientBuilder::defaultLogger(array_get($config,'logging.location'), array_get($config,'logging.level','all'));
+            $clientBuilder->setLogger($logger);
+        }
+        return $clientBuilder;
+    }
+
+
     /**
      * route the request to the query class
      * @param $connection

src/ScoutEngine.php

@@ -168,7 +168,7 @@ protected function filters(Builder $builder)
      */
     public function map($results, $model)
     {
-        if (count($results['hits']['total']) === 0) {
+        if ($results['hits']['total'] === 0) {
             return Collection::make();
         }
 

src/config/es.php

@@ -31,8 +31,8 @@
             'servers' => [
 
                 [
-                    "host" => env("ELASTIC_HOST", "127.0.0.1"),
-                    "port" => env("ELASTIC_PORT", 9200),
+                    'host' => env('ELASTIC_HOST', '127.0.0.1'),
+                    'port' => env('ELASTIC_PORT', 9200),
                     'user' => env('ELASTIC_USER', ''),
                     'pass' => env('ELASTIC_PASS', ''),
                     'scheme' => env('ELASTIC_SCHEME', 'http'),
@@ -44,6 +44,12 @@
 
             // Elasticsearch handlers
             // 'handler' => new MyCustomHandler(),
+            
+            'logging' => [
+                'enabled'   => env('ELASTIC_LOGGING_ENABLED',false),
+                'level'     => env('ELASTIC_LOGGING_LEVEL','all'),
+                'location'  => env('ELASTIC_LOGGING_LOCATION',base_path('storage/logs/elasticsearch.log'))
+            ],            
         ]
     ],
 
@@ -64,18 +70,18 @@
 
         'my_index_1' => [
 
-            "aliases" => [
-                "my_index"
+            'aliases' => [
+                'my_index'
             ],
 
             'settings' => [
-                "number_of_shards" => 1,
-                "number_of_replicas" => 0,
+                'number_of_shards' => 1,
+                'number_of_replicas' => 0,
             ],
 
             'mappings' => [
                 'posts' => [
-                    "properties" => [
+                    'properties' => [
                         'title' => [
                             'type' => 'string'
                         ]

src/helpers.php

@@ -28,4 +28,18 @@ function is_callback_function($callback)
     }
 }
 
+if (! function_exists('base_path')) {
+    /**
+     * Get the path to the base of the install.
+     *
+     * @param  string  $path
+     * @return string
+     */
+    function base_path($path = '')
+    {
+        return app()->basePath().($path ? '/'.$path : $path);
+    }
+}
+
+
 

src/storage/logs/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

tests/LoggingTest.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: mike
+ * Date: 07/05/18
+ * Time: 19:58
+ */
+
+namespace Basemkhirat\Elasticsearch\Tests;
+
+
+use Basemkhirat\Elasticsearch\Connection;
+use Elasticsearch\ClientBuilder;
+use Monolog\Logger;
+
+class LoggingTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testConfigureLogging()
+    {
+        $client = ClientBuilder::create();
+        $newClientBuilder = Connection::configureLogging($client,[
+            'logging'=>[
+                'enabled'=>true,
+                'level'=>'all',
+                'location'=>'../src/storage/logs/elasticsearch.log'
+            ]
+        ]);
+
+        $this->assertInstanceOf(ClientBuilder::class,$newClientBuilder);
+        $this->assertAttributeInstanceOf(Logger::class,'logger',$newClientBuilder);
+    }
+}