diff options
| author | Dave Arter <davea@mysociety.org> | 2018-09-28 16:20:09 +0100 |
|---|---|---|
| committer | Dave Arter <davea@mysociety.org> | 2018-09-28 16:20:09 +0100 |
| commit | aedfb6de6b4839396b8bcc885e075b28ea9b4885 (patch) | |
| tree | 1ac3c9d0148b3f98ff29985e8c760740bb8d2548 /perllib/FixMyStreet/App.pm | |
| parent | ec55469dadd99dd0f20d3d0c3b4202b6b70bb6ab (diff) | |
| parent | 07bc1188dc149e05b61e0d93ecf3ef1c26dc8690 (diff) | |
Merge branch 'pluggable-photo-storage'
Diffstat (limited to 'perllib/FixMyStreet/App.pm')
| -rw-r--r-- | perllib/FixMyStreet/App.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 160d2851e..051308920 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -10,6 +10,7 @@ use Memcached; use FixMyStreet::Map; use FixMyStreet::Email; use FixMyStreet::Email::Sender; +use FixMyStreet::PhotoStorage; use Utils; use Path::Tiny 'path'; @@ -128,11 +129,9 @@ after 'prepare_headers' => sub { __PACKAGE__->log->disable('debug') # unless __PACKAGE__->debug; -# Check upload_dir -my $cache_dir = path(FixMyStreet->config('UPLOAD_DIR'))->absolute(FixMyStreet->path_to()); -$cache_dir->mkpath; -unless ( -d $cache_dir && -w $cache_dir ) { - warn "\x1b[31mCan't find/write to photo cache directory '$cache_dir'\x1b[0m\n"; +# Set up photo storage +unless ( FixMyStreet::PhotoStorage::backend->init() ) { + warn "\x1b[31mCan't set up photo storage backend\x1b[0m\n"; } =head1 NAME |