Skip to content

Conversation

@rokinsky
Copy link
Contributor

No description provided.

@rokinsky rokinsky requested review from ace-n and grant as code owners April 27, 2020 23:40
@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added the cla: no This human has *not* signed the Contributor License Agreement. label Apr 27, 2020
@rokinsky
Copy link
Contributor Author

@googlebot I signed it!

@googlebot
Copy link

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: yes This human has signed the Contributor License Agreement. and removed cla: no This human has *not* signed the Contributor License Agreement. labels Apr 27, 2020
@ace-n
Copy link
Contributor

ace-n commented Apr 28, 2020

Maybe the better solution here is to not return anything from blurImages rather than await its result?

cc @fhinkel

@rokinsky
Copy link
Contributor Author

rokinsky commented Apr 28, 2020

@ace-n I could change it to something like this. Let me know If I understand your question correctly.

diff --git a/functions/imagemagick/index.js b/functions/imagemagick/index.js
index 730ed3ef..44cd4f5a 100644
--- a/functions/imagemagick/index.js
+++ b/functions/imagemagick/index.js
@@ -49,7 +49,7 @@ exports.blurOffensiveImages = async (event) => {
       detections.violence === 'VERY_LIKELY'
     ) {
       console.log(`Detected ${file.name} as inappropriate.`);
-      return await blurImage(file, BLURRED_BUCKET_NAME);
+      await blurImage(file, BLURRED_BUCKET_NAME);
     } else {
       console.log(`Detected ${file.name} as OK.`);
     }
@@ -102,6 +102,6 @@ const blurImage = async (file, blurredBucketName) => {
 
   // Delete the temporary file.
   const unlink = promisify(fs.unlink);
-  return unlink(tempLocalPath);
+  unlink(tempLocalPath); // non-blocking execution
 };
 // [END functions_imagemagick_blur]

@fhinkel
Copy link
Contributor

fhinkel commented Apr 28, 2020

@rokinsky Thanks for spotting the missing await in the try block. Good catch.

Merging this as is. Feel free to submit a separate PR for the unrelated changes that @ace-n suggested. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge Merge the pull request once unit tests and other checks pass. cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants