changes

Author: spinx

.gitignore

@@ -3,8 +3,6 @@
 /app/logs/*
 !app/cache/.gitkeep
 !app/logs/.gitkeep
-!bin/sidekiq
-!bin/sidekiq-web
 
 # Cache and logs (Symfony3)
 /var/cache/*
@@ -24,6 +22,10 @@
 /bin/*
 !bin/console
 !bin/symfony_requirements
+!bin/sidekiq
+!bin/sidekiq-web
+!bin/sidekiq-enterprise
+!bin/sidekiq-web-enterprise
 /vendor/
 
 # Assets and user uploads

app/config/routing_dev.yml

@@ -6,10 +6,6 @@ _profiler:
     resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
     prefix:   /_profiler
 
-_configurator:
-    resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
-    prefix:   /_configurator
-
 _errors:
     resource: "@TwigBundle/Resources/config/routing/errors.xml"
     prefix:   /_error

app/workers/user_tracker_process.rb

@@ -0,0 +1,7 @@
+class UserTrackerProcess
+    include Sidekiq::Worker
+
+    def perform(*arguments)
+        return true
+    end
+end

bin/sidekiq

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+bundle exec sidekiq -r ./sidekiq.rb -C ./sidekiq.yml

bin/sidekiq-enterprise

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+bundle exec sidekiq -r ./sidekiq-enterprise.rb -C ./sidekiq.yml

bin/sidekiq-web

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+bundle exec rackup -o 0.0.0.0 ./config.ru

bin/sidekiq-web-enterprise

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+bundle exec rackup -o 0.0.0.0 ./config-enterprise.ru

sidekiq.rb

@@ -17,7 +17,6 @@
 
 ENV['RAILS_ENV'] = ENV['RAILS_ENV'] != "development" ? ENV['RAILS_ENV'] : "devbox"
 
-
 # Redis connection
 if ENV['RAILS_ENV'] == 'production'
     rediscfg = { url: 'redis://127.0.0.1:6379/0' }

src/DLabs/UserBundle/Command/UserQueuePushCommand.php renamed to src/DLabs/UserBundle/Command/UserEnqueueCommand.php

@@ -9,12 +9,12 @@
 use Symfony\Component\Console\Input\InputOption;
 
 
-class UserQueuePushCommand extends ContainerAwareCommand
+class UserEnqueueCommand extends ContainerAwareCommand
 {
     protected function configure()
     {
         $this
-            ->setName('user:queue:push')
+            ->setName('user:enqueue')
             ->setDescription('Push tasks to queeue')
             ->addOption('num', null, InputOption::VALUE_OPTIONAL, 'Number of tasks', 100);
         ;
@@ -25,7 +25,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $numTasks = $input->getOption('num'); // add this many
 
         $container = $this->getContainer();
-        $pushService = $container->get('dlabs.worker.push_user');
+        $pushService = $container->get('dlabs.worker.enqueue_user');
         $progress = new ProgressBar($output, $numTasks);
 
         for($i = 0; $i < $numTasks; $i++){

src/DLabs/UserBundle/Command/UserTrackerEnqueueCommand.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace DLabs\UserBundle\Command;
+
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Helper\ProgressBar;
+use Symfony\Component\Console\Input\InputOption;
+
+
+class UserTrackerEnqueueCommand extends ContainerAwareCommand
+{
+    protected function configure()
+    {
+        $this
+            ->setName('user:tracker:enqueue')
+            ->setDescription('Push tasks to queeue')
+            ->addOption('num', null, InputOption::VALUE_OPTIONAL, 'Number of tasks', 100);
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $numTasks = $input->getOption('num'); // add this many
+
+        $container = $this->getContainer();
+        $pushService = $container->get('dlabs.worker.enqueue_user');
+        $progress = new ProgressBar($output, $numTasks);
+
+        for($i = 0; $i < $numTasks; $i++){
+            $pushService->execute('user.tracker_process',[rand()]);
+            $progress->advance();
+        }
+    }
+}

src/DLabs/UserBundle/DependencyInjection/DLabsUserExtension.php

@@ -23,6 +23,6 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration($configuration, $configs);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
-        $loader->load('services.yml');
+        $loader->load('queue_handler.yml');
     }
 }

src/DLabs/UserBundle/Resources/config/queue_handler.yml

@@ -2,3 +2,6 @@ services:
     dlabs.user.queue_handler.do_nothing:
         class: DLabs\UserBundle\Service\QueueHandler\DoNothingQueueHandler
 
+    dlabs.user.queue_handler.tracker_process__dummy:
+        class: DLabs\UserBundle\Service\QueueHandler\DoNothingQueueHandler
+

src/DLabs/UserBundle/Resources/config/services.yml

@@ -8,6 +8,8 @@ class DoNothingQueueHandler implements QueueHandlerInterface
 {
     public function execute()
     {
-        // Does nothing
+        if (time() % 4 === 0){
+            throw new \Exception("That's really unlucky. ");
+        }
     }
 }

src/DLabs/UserBundle/Service/QueueHandler/DoNothingQueueHandler.php

@@ -57,6 +57,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
                 $output->writeln(sprintf('Generated <info>%s</info>', "app/workers/{$filename}"));
             }else{
+                $filename = str_replace('__dummy','', $filename);
                 $output->writeln(sprintf('Skipping <info>%s</info>', "app/workers/{$filename}"));
             }
         }

src/DLabs/WorkerBundle/Command/WorkerGenerateCommand.php

@@ -2,15 +2,15 @@ services:
     # ----------------------------------------
     # Push to queue tasks
     # ----------------------------------------
-    dlabs.worker.push:
-        class: DLabs\WorkerBundle\Service\Queue\PushToQueue
+    dlabs.worker.enqueue:
+        class: DLabs\WorkerBundle\Service\Queue\Enqueue
         arguments:
             - '@dlabs.worker.sidekiq_client.default'
             - default
             - '@dlabs.worker.generator.sidekiq_worker_name'
 
-    dlabs.worker.push_user:
-        class: DLabs\WorkerBundle\Service\Queue\PushToQueue
+    dlabs.worker.enqueue_user:
+        class: DLabs\WorkerBundle\Service\Queue\Enqueue
         arguments:
             - '@dlabs.worker.sidekiq_client.user'
             - user

src/DLabs/WorkerBundle/Resources/config/worker.yml

@@ -7,7 +7,7 @@
 
 /**
  */
-class PushToQueue
+class Enqueue
 {
     /** @var Client */
     protected $client;