add new background_batching and background_daemon options to google cloud adapter

Author: matthewgoslett

changelog.md

@@ -3,6 +3,7 @@
 ## 3.0.0 - 2017-07-25
 
 * Bump up to superbalist/php-pubsub-google-cloud ^5.0 which allows for background daemon support
+* Add new background_batching and background_daemon options to Google Cloud adapter
 
 ## 2.0.4 - 2017-07-03
 

src/PubSubConnectionFactory.php

@@ -124,8 +124,20 @@ protected function makeGoogleCloudAdapter(array $config)
         $clientIdentifier = array_get($config, 'client_identifier');
         $autoCreateTopics = array_get($config, 'auto_create_topics', true);
         $autoCreateSubscriptions = array_get($config, 'auto_create_subscriptions', true);
+        $backgroundBatching = array_get($config, 'background_batching', false);
+        $backgroundDaemon = array_get($config, 'background_daemon', false);
 
-        return new GoogleCloudPubSubAdapter($client, $clientIdentifier, $autoCreateTopics, $autoCreateSubscriptions);
+        if ($backgroundDaemon) {
+            putenv('IS_BATCH_DAEMON_RUNNING=true');
+        }
+
+        return new GoogleCloudPubSubAdapter(
+            $client,
+            $clientIdentifier,
+            $autoCreateTopics,
+            $autoCreateSubscriptions,
+            $backgroundBatching
+        );
     }
 
     /**

src/config/config.php

@@ -60,6 +60,8 @@
             'auto_create_topics' => true,
             'auto_create_subscriptions' => true,
             'auth_cache' => null, // eg: \Google\Auth\Cache\MemoryCacheItemPool::class,
+            'background_batching' => false,
+            'background_daemon' => false,
         ],
 
         'http' => [

tests/PubSubConnectionFactoryTest.php

@@ -169,6 +169,8 @@ public function testMakeGoogleCloudAdapter()
             'key_file' => 'my_key_file.json',
             'client_identifier' => 'blah',
             'auto_create_topics' => false,
+            'background_batching' => true,
+            'background_daemon' => false,
         ];
         $adapter = $factory->make('gcloud', $config);
         $this->assertInstanceOf(GoogleCloudPubSubAdapter::class, $adapter);
@@ -178,6 +180,45 @@ public function testMakeGoogleCloudAdapter()
         $this->assertEquals('blah', $adapter->getClientIdentifier());
         $this->assertFalse($adapter->areTopicsAutoCreated());
         $this->assertTrue($adapter->areSubscriptionsAutoCreated());
+        $this->assertTrue($adapter->isBackgroundBatchingEnabled());
+        $this->assertFalse(getenv('IS_BATCH_DAEMON_RUNNING'));
+    }
+
+    public function testMakeGoogleCloudAdapterWithBackgroundBatchingAndDaemonEnabled()
+    {
+        $container = Mockery::mock(Container::class);
+        $container->shouldReceive('make')
+            ->withArgs([
+                'pubsub.gcloud.pub_sub_client',
+                [
+                    'config' => [
+                        'projectId' => 12345,
+                        'keyFilePath' => 'my_key_file.json',
+                    ],
+                ],
+            ])
+            ->andReturn(Mockery::mock(GoogleCloudPubSubClient::class));
+
+        $factory = new PubSubConnectionFactory($container);
+
+        $config = [
+            'project_id' => '12345',
+            'key_file' => 'my_key_file.json',
+            'client_identifier' => 'blah',
+            'auto_create_topics' => false,
+            'background_batching' => true,
+            'background_daemon' => true,
+        ];
+        $adapter = $factory->make('gcloud', $config);
+        $this->assertInstanceOf(GoogleCloudPubSubAdapter::class, $adapter);
+
+        $adapter = $factory->make('gcloud', $config); /* @var GoogleCloudPubSubAdapter $adapter */
+        $this->assertInstanceOf(GoogleCloudPubSubAdapter::class, $adapter);
+        $this->assertEquals('blah', $adapter->getClientIdentifier());
+        $this->assertFalse($adapter->areTopicsAutoCreated());
+        $this->assertTrue($adapter->areSubscriptionsAutoCreated());
+        $this->assertTrue($adapter->isBackgroundBatchingEnabled());
+        $this->assertEquals('true',getenv('IS_BATCH_DAEMON_RUNNING'));
     }
 
     public function testMakeGoogleCloudAdapterWithAuthCache()