wait #6549 @1

diff --git a/.docker/dev/docker-compose.yml b/.docker/dev/docker-compose.yml
index 931089ba89d9c469ab0506596e40b2c2cac62cba..b93fdb88b648cf280943b1b36be2a7c94bf10694 100644 (file)
--- a/.docker/dev/docker-compose.yml
+++ b/.docker/dev/docker-compose.yml
@@ -107,18 +107,18 @@ services:
           - pmi-dev
         restart: unless-stopped
 
-    elasticsearch:
-        container_name: pmi-dev-elasticsearch
-        build: './images/elasticsearch'
-        volumes:
-          - ./esdata:/usr/share/elasticsearch/data
-        environment:
-          - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-          - discovery.type=single-node
-          - xpack.security.enabled=false
-        networks:
-          - pmi-dev
-        restart: unless-stopped
+#    elasticsearch:
+#        container_name: pmi-dev-elasticsearch
+#        build: './images/elasticsearch'
+#        volumes:
+#          - ./esdata:/usr/share/elasticsearch/data
+#        environment:
+#          - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+#          - discovery.type=single-node
+#          - xpack.security.enabled=false
+#        networks:
+#          - pmi-dev
+#        restart: unless-stopped
 
 networks:
   pmi-dev:

diff --git a/.docker/dev/terminal.bat b/.docker/dev/terminal.bat
index 2475cedee075298b7e96ac2fe181b22baf62f673..972d0be01dd0a4cd51fb7b291cc0dcce63322c41 100644 (file)
--- a/.docker/dev/terminal.bat
+++ b/.docker/dev/terminal.bat
@@ -1,3 +1,3 @@
 @echo off
 cls
-ssh -t root@clockwork.cubedesigners.com 'docker exec -it -u pmi-dev pmi-dev /bin/bash'
+ssh -t root@godzilla.cubedesigners.com 'docker exec -it -u pmi-dev pmi-dev /bin/bash'

diff --git a/.docker/production/terminal.bat b/.docker/production/terminal.bat
index 811e24e1b1047b0064935a9fc4359ab11ad1c72d..8dfab015de7968ed70f84c9c1317ed591fe66b09 100644 (file)
--- a/.docker/production/terminal.bat
+++ b/.docker/production/terminal.bat
@@ -1,3 +1,3 @@
 @echo off
 cls
-ssh -t root@clockwork.cubedesigners.com 'docker exec -it -u pmi pmi /bin/bash'
+ssh -t root@godzilla.cubedesigners.com 'docker exec -it -u pmi pmi /bin/bash'

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 1f5aeaebb4b135309b46d3d9d679ddeb0d5bfc87..675a94b4fccc37492a2b2d95572813b4ba9b646f 100644 (file)
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -24,10 +24,13 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->command('backup:clean')->daily()->at('04:00');
-        $schedule->command('backup:run')->daily()->at('05:00');
-        $schedule->command('cubist:search:index', ['PMI', 'all'])->cron('35 */4 * * *');
-        $schedule->command('cubist:search:index', ['MICHSCI', 'all'])->cron('5 */4 * * *');
+        if (config('app.env') !== 'production') {
+            return;
+        }
+//        $schedule->command('backup:clean')->daily()->at('04:00');
+//        $schedule->command('backup:run')->daily()->at('05:00');
+        $schedule->command('cubist:search:index', ['PMI', 'all'])->cron('35 */6 * * *');
+        $schedule->command('cubist:search:index', ['MICHSCI', 'all'])->cron('5 */6 * * *');
     }
 
     /**

diff --git a/app/Models/Product.php b/app/Models/Product.php
index ebc673ee434bb5ea07803efca71d441f5aabb804..c04cf82d7b7569c45304a6bbf456ad8ec5c1cd77 100644 (file)
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -581,9 +581,7 @@ class Product extends CubistMagicPageModel
     public function renderLink()
     {
         $p = $this;
-        return \cache()->remember('product_details_' . $this->id . '_' . App::getLocale() . '_' . App::getVariant(), 3600, function () use ($p) {
-            return view('partials.product-link', ['id' => $p->id, 'product' => $p->getPageData()])->render();
-        });
+        return view('partials.product-link', ['id' => $p->id, 'product' => $p->getPageData()])->render();
     }
 
 

diff --git a/app/Templates/Category.php b/app/Templates/Category.php
index d91f6b83e41ea60c28080b1adae9cf9c7eac0736..21ddbcd232b9ada1552f2165b84ad1d93fd4d10d 100644 (file)
--- a/app/Templates/Category.php
+++ b/app/Templates/Category.php
@@ -54,27 +54,26 @@ class Category extends Base
         $cat = $data['page']->get('category');
 
         \Barryvdh\Debugbar\Facade::startMeasure('set cat data ' . $cat);
-        $d = cache()->remember('cat_data_' . $cat . '_' . App::getVariant() . '_' . App::getLocale(), 3600, function () use ($cat) {
-            $res = [];
-            $productType = ProductType::find($cat);
-            if (!$productType) {
-                return false;
-            }
-            $res['product_type'] = $productType->getPageData();
-
-            $res['products'] = Product::whereVariant()
-                ->where('product_type', $cat)
-                ->where('online', 1)
-                ->where('public', 1)
-                ->orderBy('reference')
-                ->get();
-
-            // Get available filters
-            $filters = Product::getFilteredProducts($cat);
-            $res['filters'] = $filters ? $filters['filters'] : []; // To be used by Vue component
-            $res['filter_results'] = $filters ? $filters['results'] : [];
-            return $res;
-        });
+
+        $d = [];
+        $productType = ProductType::find($cat);
+        if (!$productType) {
+            return false;
+        }
+        $d['product_type'] = $productType->getPageData();
+
+        $d['products'] = Product::whereVariant()
+            ->where('product_type', $cat)
+            ->where('online', 1)
+            ->where('public', 1)
+            ->orderBy('reference')
+            ->get();
+
+        // Get available filters
+        $filters = Product::getFilteredProducts($cat);
+        $d['filters'] = $filters ? $filters['filters'] : []; // To be used by Vue component
+        $d['filter_results'] = $filters ? $filters['results'] : [];
+
         if (!$d) {
             $this->_404();
         }