chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Merge pull request #1603 from pixelfed/staging

Browse source 
Allow redis to be used over a UNIX socket
This commit is contained in:
daniel 2019-08-13 01:55:29 -06:00 • committed by GitHub
commit cb62ab4ecc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env.example
View file

@ -25,6 +25,7 @@ SESSION_DRIVER=redis
SESSION_LIFETIME=120 SESSION_LIFETIME=120
QUEUE_DRIVER=redis QUEUE_DRIVER=redis
REDIS_SCHEME=tcp
REDIS_HOST=127.0.0.1 REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null REDIS_PASSWORD=null
REDIS_PORT=6379 REDIS_PORT=6379

1
.env.testing
View file

@ -25,6 +25,7 @@ SESSION_DRIVER=redis
SESSION_LIFETIME=120 SESSION_LIFETIME=120
QUEUE_DRIVER=redis QUEUE_DRIVER=redis
REDIS_SCHEME=tcp
REDIS_HOST=127.0.0.1 REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null REDIS_PASSWORD=null
REDIS_PORT=6379 REDIS_PORT=6379

14
app/Place.php
View file

@ -7,15 +7,8 @@ use Pixelfed\Snowflake\HasSnowflakePrimary;
class Place extends Model class Place extends Model
{ {
use HasSnowflakePrimary; protected $visible = ['id', 'name', 'country', 'slug'];
/**
* Indicates if the IDs are auto-incrementing.
*
* @var bool
*/
public $incrementing = false;
public function url() public function url()
{ {
return url('/discover/places/' . $this->id . '/' . $this->slug); return url('/discover/places/' . $this->id . '/' . $this->slug);
@ -30,4 +23,9 @@ class Place extends Model
{ {
return $this->posts()->count(); return $this->posts()->count();
} }
public function statuses()
{
return $this->hasMany(Status::class, 'id', 'place_id');
}
} }

2
config/cache.php
View file

@ -73,6 +73,8 @@ return [
'client' => 'predis', 'client' => 'predis',
'default' => [ 'default' => [
'scheme' => env('REDIS_SCHEME', 'tcp'),
'path' => env('REDIS_PATH'),
'host' => env('REDIS_HOST', 'localhost'), 'host' => env('REDIS_HOST', 'localhost'),
'password' => env('REDIS_PASSWORD', null), 'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379), 'port' => env('REDIS_PORT', 6379),

2
config/database.php
View file

@ -109,6 +109,8 @@ return [
'client' => 'predis', 'client' => 'predis',
'default' => [ 'default' => [
'scheme' => env('REDIS_SCHEME', 'tcp'),
'path' => env('REDIS_PATH'),
'host' => env('REDIS_HOST', '127.0.0.1'), 'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null), 'password' => env('REDIS_PASSWORD', null),
'port' => env('REDIS_PORT', 6379), 'port' => env('REDIS_PORT', 6379),