Merge pull request #67 from talis/namespace-spec-defined-queues

90%: All queues (manually sent or defined in specs) should be namespaced
techfromsage · Jun 24, 2015 · 3ee0a04 · 3ee0a04
2 parents 609a4a2 + ecea07e
commit 3ee0a04
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/src/mongo/jobs/ApplyOperation.class.php b/src/mongo/jobs/ApplyOperation.class.php
@@ -57,6 +57,10 @@ public function createJob(Array $subjects, $queueName=null)
         {
             $queueName = \Tripod\Mongo\Config::getApplyQueueName();
         }
+        elseif(strpos($queueName, \Tripod\Mongo\Config::getApplyQueueName()) === false)
+        {
+            $queueName = \Tripod\Mongo\Config::getApplyQueueName() . '::' . $queueName;
+        }
 
         $data = array(
             self::SUBJECTS_KEY=>array_map(function(\Tripod\Mongo\ImpactedSubject $subject) { return $subject->toArray(); }, $subjects),

diff --git a/src/mongo/jobs/DiscoverImpactedSubjects.class.php b/src/mongo/jobs/DiscoverImpactedSubjects.class.php
@@ -144,6 +144,10 @@ public function createJob(Array $data, $queueName=null)
         {
             $queueName = Config::getDiscoverQueueName();
         }
+        elseif(strpos($queueName, \Tripod\Mongo\Config::getDiscoverQueueName()) === false)
+        {
+            $queueName = \Tripod\Mongo\Config::getDiscoverQueueName() . '::' . $queueName;
+        }
         $this->submitJob($queueName,get_class($this),$data);
     }
 

diff --git a/test/unit/mongo/ApplyOperationTest.php b/test/unit/mongo/ApplyOperationTest.php
@@ -273,7 +273,7 @@ public function testCreateJobSpecifyQueue()
             ->setMockClassName('MockApplyOperation')
             ->getMock();
 
-        $queueName = 'TRIPOD_TESTING_QUEUE_' . uniqid();
+        $queueName = \Tripod\Mongo\Config::getApplyQueueName() . '::TRIPOD_TESTING_QUEUE_' . uniqid();
 
         $applyOperation->expects($this->once())
             ->method('submitJob')

diff --git a/test/unit/mongo/DiscoverImpactedSubjectsTest.php b/test/unit/mongo/DiscoverImpactedSubjectsTest.php
@@ -250,7 +250,7 @@ public function testCreateJobSpecifyQueue()
             'contextAlias'=>'http://talisaspire.com/'
         );
 
-        $queueName = 'TRIPOD_TESTING_QUEUE_' . uniqid();
+        $queueName = \Tripod\Mongo\Config::getDiscoverQueueName() . '::TRIPOD_TESTING_QUEUE_' . uniqid();
 
         /** @var \Tripod\Mongo\Jobs\DiscoverImpactedSubjects|PHPUnit_Framework_MockObject_MockObject $discoverImpactedSubjects */
         $discoverImpactedSubjects = $this->getMockBuilder('\Tripod\Mongo\Jobs\DiscoverImpactedSubjects')