elasticsearch and several library updates

Author: hkulekci

.docker/logstash/conf/logstash.conf

@@ -2,9 +2,9 @@ input {
   jdbc {
     jdbc_driver_library => "mysql-connector-java-5.1.36-bin.jar"
     jdbc_driver_class => "com.mysql.jdbc.Driver"
-    jdbc_connection_string => "jdbc:mysql://mysql:33060/node_es_example"
+    jdbc_connection_string => "jdbc:mysql://127.0.0.1:33060/node_es_example"
     jdbc_user => "root"
-    jdbc_password => "123456"
+    jdbc_password => ""
     schedule => "* * * * *"
     statement => "CALL fetchDataForElastic(:sql_last_value);"
   }
@@ -30,9 +30,8 @@ output {
 
   elasticsearch
   {
-    hosts => ["elasticsearch:9200"]
+    hosts => ["127.0.0.1:9200"]
     index => "products"
-    document_type => "product"
     document_id => "%{id}"
   }
 }

README.md

@@ -52,7 +52,6 @@ PUT products
           "type": "custom",
           "tokenizer": "standard",
           "filter": [
-            "standard",
             "lowercase",
             "asciifolding"
           ]
@@ -70,7 +69,7 @@ PUT products
 }
 
 
-PUT products/product/_mapping
+PUT products/_mapping
 {
   "properties": {
     "name": {

app.js

@@ -1,29 +1,26 @@
-var express = require('express');
-var path = require('path');
-var favicon = require('serve-favicon');
-var logger = require('morgan');
-var cookieParser = require('cookie-parser');
-var bodyParser = require('body-parser');
-var lessMiddleware = require('less-middleware');
+const express = require('express');
+const path = require('path');
+const logger = require('morgan');
+const cookieParser = require('cookie-parser');
+const bodyParser = require('body-parser');
+const lessMiddleware = require('less-middleware');
 
 // .env file configuration
 require('dotenv').config();
 
 
-var index = require('./routes/index');
-var products = require('./routes/products');
-var categories = require('./routes/categories');
-var search = require('./routes/search');
-var graphs = require('./routes/graphs');
+const index = require('./routes/index');
+const products = require('./routes/products');
+const categories = require('./routes/categories');
+const search = require('./routes/search');
+const graphs = require('./routes/graphs');
 
-var app = express();
+const app = express();
 
 // view engine setup
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'twig');
 
-// uncomment after placing your favicon in /public
-//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
 app.use(logger('dev'));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
@@ -39,7 +36,7 @@ app.use('/graphs', graphs);
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
-  var err = new Error('Not Found');
+  const err = new Error('Not Found');
   err.status = 404;
   next(err);
 });

libraries/database.js

@@ -1,4 +1,4 @@
-var mysql = require('mysql');
+var mysql = require('mysql2');
 
 var pool = mysql.createPool({
   host: process.env.MYSQL_HOST,

libraries/elasticsearch.js

@@ -1,6 +1,6 @@
-var elasticsearch = require('elasticsearch');
-var client = new elasticsearch.Client({
-  host: process.env.ELASTIC_HOST,
+const { Client } = require('@elastic/elasticsearch');
+const client = new Client({
+  node: process.env.ELASTIC_HOST,
   log: process.env.ELASTIC_LOG
 });
 

libraries/redis-client.js

@@ -1,7 +1,9 @@
 var redis = require('redis');
-  client = redis.createClient({'host': 'redis'});
+  client = redis.createClient({'host': process.env.REDIS_HOST});
 
-var RedisClient = {
+await client.connect();
+
+const RedisClient = {
   getClient: function() {
     return client;
   },