Skip to content

Commit

Permalink
name conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
David Lippi committed Nov 19, 2014
1 parent 599a8b7 commit 498276c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ Add the Service Provider to the providers array in config/app.php

I suggest to publish migrations, so they are copied to your regular migrations

$ php artisan migrate:publish barryvdh/laravel-async-queue
$ php artisan migrate:publish davelip/laravel-database-queue

And then run migrate

$ php artisan migrate

You should now be able to use the async driver in config/queue.php
You should now be able to use the database driver in config/queue.php

'default' => 'database',

Expand Down
2 changes: 1 addition & 1 deletion src/Connectors/DatabaseConnector.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php namespace Davelip\Queue\Connectors;

use Illuminate\Queue\Connectors\ConnectorInterface;
use Barryvdh\Queue\AsyncQueue;
use Davelip\Queue\AsyncQueue;

class DatabaseConnector implements ConnectorInterface {

Expand Down
8 changes: 4 additions & 4 deletions src/DatabaseServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ protected function registerDatabaseCommand()
{
$app = $this->app;

$app['command.queue.async'] = $app->share(function($app)
$app['command.queue.database'] = $app->share(function($app)
{
return new DatabaseCommand();
});

$this->commands('command.queue.async');
$this->commands('command.queue.database');
}

/**
Expand All @@ -56,7 +56,7 @@ protected function registerDatabaseCommand()
*/
protected function registerDatabaseConnector($manager)
{
$manager->addConnector('async', function()
$manager->addConnector('database', function()
{
return new DatabaseConnector;
});
Expand All @@ -69,7 +69,7 @@ protected function registerDatabaseConnector($manager)
*/
public function provides()
{
return array('command.queue.async');
return array('command.queue.database');
}

}
2 changes: 1 addition & 1 deletion src/migrations/2014_11_11_111111_create_queues_table.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public function up()
$table->string('queue', 255)->nullable()->default(null);
$table->integer('status')->default(0);
$table->integer('retries')->default(0);
$table->timestamp('timestamp')->default(0);
$table->timestamp('timestamp');
$table->longText('payload')->nullable();
$table->timestamps();
});
Expand Down

0 comments on commit 498276c

Please sign in to comment.