medvedych/fotostore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

small cleanup

Browse source
This commit is contained in:
Denis Fedoseev 2018-08-01 10:18:24 +03:00
parent 87ad4111a8
commit d4a1f99b71
1 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
fotostore.pl
View file

@ -257,11 +257,10 @@ post '/upload' => ( authenticated => 1 ) => sub {
# Save to file # Save to file
$image->move_to($image_file); $image->move_to($image_file);
$log->debug("Spwan subprocess");
my $promise = store_image($image_file, $image->filename, $user_id); my $promise = store_image($image_file, $image->filename, $user_id);
#TODO: add errors handling
Mojo::Promise->all($promise)->then(sub { Mojo::Promise->all($promise)->then(sub {
$self->render( $self->render(
json => { json => {
@ -277,32 +276,6 @@ post '/upload' => ( authenticated => 1 ) => sub {
); );
})->wait; })->wait;
# $log->debug("wait for promise");
# Mojo::Promise->all($spawn_subprocess)->then(sub {
# $self->render(
# json => {
# files => [
# {
# name => $image->filename,
# size => $image->size,
# url => sprintf( '/images/orig/%s', $filename ),
# thumbnailUrl => sprintf( '/images/200/%s', $filename ),
# }
# ]
# }
# );
# })->catch(sub {
# my $err = shift;
# warn "Something went wrong: $err";
# })->wait;
# Redirect to top page
# $self->redirect_to('index');
} => 'upload'; } => 'upload';
sub create_hash { sub create_hash {
@ -327,7 +300,7 @@ sub store_image {
my $user_id = shift; my $user_id = shift;
my $promise = Mojo::Promise->new; my $promise = Mojo::Promise->new;
# Operation that would block the event loop for 5 seconds # Process and store uploaded file in a separate process
Mojo::IOLoop->subprocess( Mojo::IOLoop->subprocess(
sub { sub {
my $subprocess = shift; my $subprocess = shift;
@ -371,19 +344,17 @@ sub store_image {
die sprintf('Can\'t save file %s', $filename); die sprintf('Can\'t save file %s', $filename);
} }
$log->debug("done!");
return $filename; return $filename;
}, },
sub { sub {
my ($subprocess, $err, @results) = @_; my ($subprocess, $err, @results) = @_;
say "Subprocess error: $err" and return if $err; $log->error("Subprocess error: $err") and return if $err;
$promise->reject("I $results[0] $results[1]!") if $err; $promise->reject("Subprocess error: $err @results") if $err;
$promise->resolve(@results); $promise->resolve(1, @results);
} }
); );
return $promise; return $promise;
} }
Mojo::IOLoop->start; Mojo::IOLoop->start;