Fixed doctrine provider

xaav · xaav · commit 9524bc41fdec · 2011-10-08T18:42:41.000-05:00
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -18,11 +18,16 @@ class Configuration implements ConfigurationInterface
     public function getConfigTreeBuilder()
     {
         $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root('xaav_queue_bundle');
+        $rootNode = $treeBuilder->root('xaav_queue');
 
-        // Here you should define the parameters that are allowed to
-        // configure your bundle. See the documentation linked above for
-        // more information on that topic.
+        $rootNode
+        	->children()
+        		->scalarNode('driver')
+        			->cannotBeOverwritten()
+        			->isRequired()
+        			->cannotBeEmpty()
+        			->end()
+        		->end();
 
         return $treeBuilder;
     }
diff --git a/DependencyInjection/XaavQueueExtension.php b/DependencyInjection/XaavQueueExtension.php
@@ -11,8 +11,8 @@ class XaavQueueExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container)
     {
-    	$configuration = new Configuration();
-    	$config = $this->processConfiguration($configuration, $configs);
+    	//$configuration = new Configuration();
+    	//$config = $this->processConfiguration($configuration, $configs);
 
         $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');
diff --git a/Entity/JobQueue.php b/Entity/JobQueue.php
@@ -24,7 +24,7 @@ class JobQueue extends DoctrineJobQueue implements JobQueueInterface
     protected $name;
 
     /**
-     * @ORM\OneToMany(targetEntity="SerializedJob", mappedBy="jobQueue")
+     * @ORM\OneToMany(targetEntity="SerializedJob", mappedBy="jobQueue",cascade={"persist", "all"})
      */
     protected $serializedJobs;
 
diff --git a/Entity/SerializedJob.php b/Entity/SerializedJob.php
@@ -22,10 +22,20 @@ class SerializedJob
 	protected $data;
 
 	/**
-	 * ORM\ManyToOne(targetEntity="jobQueue", mappedBy="serializedJobs")
+	 * @ORM\ManyToOne(targetEntity="JobQueue")
 	 */
 	protected $jobQueue;
 
+	public function getJobQueue()
+	{
+		return $this->jobQueue;
+	}
+
+	public function setJobQueue(JobQueue $jobQueue)
+	{
+		$this->jobQueue = $jobQueue;
+	}
+
 	public function setData($data)
 	{
 		$this->data = $data;
diff --git a/JobQueue/JobQueue/DoctrineJobQueue.php b/JobQueue/JobQueue/DoctrineJobQueue.php
@@ -2,6 +2,7 @@
 
 namespace Xaav\QueueBundle\JobQueue\JobQueue;
 
+use Doctrine\ORM\EntityManager;
 use Xaav\QueueBundle\Entity\SerializedJob;
 use Xaav\QueueBundle\JobQueue\Job\JobInterface;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -13,18 +14,31 @@ class DoctrineJobQueue implements JobQueueInterface
 	 */
 	protected $serializedJobs;
 
+	/**
+	 * @var EntityManager
+	 */
+	protected $entityManager;
+
+	public function setEntityManager(EntityManager $entityManager)
+	{
+		$this->entityManager = $entityManager;
+	}
+
     public function getJobFromQueue()
     {
     	$serializedJob = $this->serializedJobs->last();
-    	$this->serializedJobs->remove($this->serializedJobs->key());
+    	$this->entityManager->remove($serializedJob);
 
-    	return unserialize($serializedJob->getData());
+    	if ($serializedJob) {
+    		return unserialize($serializedJob->getData());
+    	}
     }
 
     public function addJobToQueue(JobInterface $job)
     {
     	$serializedJob = new SerializedJob();
     	$serializedJob->setData(serialize($job));
+    	$serializedJob->setJobQueue($this);
 
     	$this->serializedJobs->add($serializedJob);
     }
diff --git a/JobQueue/Provider/DoctrineProvider.php b/JobQueue/Provider/DoctrineProvider.php
@@ -2,46 +2,34 @@
 
 namespace Xaav\QueueBundle\JobQueue\Provider;
 
+use Doctrine\ORM\EntityManager;
 use Xaav\QueueBundle\Entity\JobQueue;
 
 class DoctrineProvider implements JobQueueProviderInterface
 {
     protected $entityManager;
 
-    public function __construct($entityManager)
+    public function __construct(EntityManager $entityManager)
     {
         $this->entityManager = $entityManager;
     }
 
     public function getJobQueueByName($name)
     {
-        $result = $this->entityManager
+        $queue = $this->entityManager
                        ->getRepository('XaavQueueBundle:JobQueue')
                        ->findOneByName($name);
 
-        if($result) {
-
-            return $result;
-        }
-        else {
+        if(!$queue) {
 
             $queue = new JobQueue();
             $queue->setName($name);
 
             $this->entityManager->persist($queue);
-
-            return $queue;
         }
-    }
 
-    public function __destruct()
-    {
-        try {
-            $this->entityManager->flush();
-        }
-        catch (\Exception $ex)
-        {
-            //Throwing an exception will cause bad things!
-        }
+        $queue->setEntityManager($this->entityManager);
+
+        return $queue;
     }
 }
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
@@ -1,10 +1,4 @@
 services:
-  xaav.jobqueue.provider.amqp:
-    class: Xaav\QueueBundle\JobQueue\Provider\AMQPProvider
-    arguments: []
-  xaav.jobqueue.provider.doctrine:
-    class: Xaav\QueueBundle\JobQueue\Provider\DoctrineProvider
-    arguments: [@doctrine.orm.entity_manager]
-  xaav.jobqueue.provider.flatfile:
-    class: Xaav\QueueBundle\JobQueue\Provider\FlatFileProvider
-    arguments: [%kernel.cache_dir%]
+  xaav.jobqueue.processor:
+    class: Xaav\QueueBundle\JobQueue\JobQueueProcessor
+    arguments: [ @xaav.jobqueue.provider ]

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ class XaavQueueExtension extends Extension`
`11`	`11`	`{`
`12`	`12`	`public function load(array $configs, ContainerBuilder $container)`
`13`	`13`	`{`
`14`		`- $configuration = new Configuration();`
`15`		`- $config = $this->processConfiguration($configuration, $configs);`
	`14`	`+ //$configuration = new Configuration();`
	`15`	`+ //$config = $this->processConfiguration($configuration, $configs);`
`16`	`16`
`17`	`17`	`$loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));`
`18`	`18`	`$loader->load('services.yml');`