Skip to content

Commit

Permalink
Merge pull request #91 from TeenQuotes/feature/memcached-to-redis
Browse files Browse the repository at this point in the history
Switch to Redis for cache and queues
  • Loading branch information
AntoineAugusti committed Apr 16, 2016
2 parents 3843234 + 01c33a7 commit 2108c9b
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 58 deletions.
4 changes: 0 additions & 4 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ SMTP_PASSWORD=dummy
SMS_USER=dummy
SMS_PASSWORD=dummy

# QUEUES
IRON_PROJECT=dummy
IRON_TOKEN=dummy

# PUSHBULLET
PUSHBULLET_APIKEY=dummy
PUSHBULLET_DEVICE_IDEN=dummy
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,12 @@ Teen Quotes lets teenagers share their daily thoughts and feelings. It describes
# Basic dependencies
- PHP >= 5.5 with the PDO and MCrypt extensions
- MySQL >= 5.6 (because we need to perform FULLTEXT search on InnoDB tables)
- Memcached >= 1.4 or another cache storage (Redis for example)
- Redis server for cache and queues

# External services I'm relying on
- [Mailgun](http://www.mailgun.com) for transactional emails
- [Mailchimp](http://mailchimp.com) for newsletters
- [Easyrec](http://easyrec.org) for the recommendation system (not actively used for the moment)
- [iron.io](http://www.iron.io) for message queues
- [Pushbullet](https://www.pushbullet.com) for notifications for administrators
- [Bugsnag](https://bugsnag.com) to track exceptions

Expand Down Expand Up @@ -51,4 +50,4 @@ $ gulp
**Antoine AUGUSTI** - http://www.antoine-augusti.fr

## Under which license?
CC BY-NC-SA http://creativecommons.org/licenses/by-nc-sa/4.0/
CC BY-NC-SA http://creativecommons.org/licenses/by-nc-sa/4.0/
47 changes: 0 additions & 47 deletions app/TeenQuotes/Queues/QueuesServiceProvider.php

This file was deleted.

4 changes: 2 additions & 2 deletions app/TeenQuotes/Queues/Workers/EasyrecWorker.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public function viewUserProfile($job, $data)
/**
* Add a quote to the favorites.
*
* @param \Illuminate\Queue\Jobs\Job $job [ription]
* @param \Illuminate\Queue\Jobs\Job $job
* @param array $data Required keys: quote_id, user_id
*/
public function favoriteAQuote($job, $data)
Expand All @@ -98,7 +98,7 @@ public function favoriteAQuote($job, $data)
/**
* Remove a quote from the favorites.
*
* @param \Illuminate\Queue\Jobs\Job $job [ription]
* @param \Illuminate\Queue\Jobs\Job $job
* @param array $data Required keys: quote_id, user_id
*/
public function unfavoriteAQuote($job, $data)
Expand Down
1 change: 0 additions & 1 deletion app/config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@
'TeenQuotes\Newsletters\NewslettersServiceProvider',
'TeenQuotes\Notifiers\AdminNotifierServiceProvider',
'TeenQuotes\Pages\PagesServiceProvider',
'TeenQuotes\Queues\QueuesServiceProvider',
'TeenQuotes\Quotes\QuotesServiceProvider',
'TeenQuotes\Robots\RobotsServiceProvider',
'TeenQuotes\Settings\SettingsServiceProvider',
Expand Down
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"laracasts/validation": "~1.0",
"mailchimp/mailchimp": "~2.0",
"vlucas/phpdotenv": "~1.0",
"iron-io/iron_mq": "~1.0",
"healey/robots": "dev-master",
"ivkos/pushbullet": "~2.0",
"bugsnag/bugsnag-laravel": "1.*"
Expand Down

0 comments on commit 2108c9b

Please sign in to comment.