cilogon less verbose + more logs for save error

Added some messages to make sure files are saved correctly.
Group checks for cilogon are now debug messages.

Author: robkooper

CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 - Updated swagger documentation
 
+### Changed
+- Added more information when writing files to make sure files are written correctly
+- Made cilogon group check debug message instead of error message
+
 ## 1.18.0 - 2021-07-08
 
 ### Added

app/services/CILogonProvider.scala

@@ -57,7 +57,7 @@ class CILogonProvider(application: Application) extends OAuth2Provider(applicati
               }
             }
             case (Some(_), None) => throw new AuthenticationException()
-            case (None, _) => Logger.error("[securesocial] No check needed for groups")
+            case (None, _) => Logger.debug("[securesocial] No check needed for groups")
           }
           user.copy(
             identityId = IdentityId(userId, id),

app/util/FileUtils.scala

@@ -399,14 +399,19 @@ object FileUtils {
     val fileExecutionContext: ExecutionContext = Akka.system().dispatchers.lookup("akka.actor.contexts.file-processing")
     Future {
       try {
-        saveFile(file, f.ref.file, originalZipFile, clowderurl, apiKey, Some(user)).foreach { fixedfile =>
-          processFileBytes(fixedfile, f.ref.file, dataset)
-          files.setStatus(fixedfile.id, FileStatus.UPLOADED)
-          sinkService.logFileUploadEvent(fixedfile, dataset, Option(user))
-          processFile(fixedfile, clowderurl, index, flagsFromPrevious, showPreviews, dataset, runExtractors, apiKey)
-          processDataset(file, dataset, folder, clowderurl, user, index, runExtractors, apiKey)
-          files.setStatus(fixedfile.id, FileStatus.PROCESSED)
+        saveFile(file, f.ref.file, originalZipFile, clowderurl, apiKey, Some(user)).match {
+          case Some(fixedfile) => {
+            processFileBytes(fixedfile, f.ref.file, dataset)
+            files.setStatus(fixedfile.id, FileStatus.UPLOADED)
+            sinkService.logFileUploadEvent(fixedfile, dataset, Option(user))
+            processFile(fixedfile, clowderurl, index, flagsFromPrevious, showPreviews, dataset, runExtractors, apiKey)
+            processDataset(file, dataset, folder, clowderurl, user, index, runExtractors, apiKey)
+            files.setStatus(fixedfile.id, FileStatus.PROCESSED)
+          }
+          case None => Logger.error(s"File was not saved for ${file.id}, saveFile returned None")
         }
+      } catch {
+        case _: Throwable => Logger.error(s"Error (${_}), file was not saved for ${file.id}")
       } finally {
         f.ref.clean()
       }
@@ -455,12 +460,18 @@ object FileUtils {
     // process rest of file in background
     val fileExecutionContext: ExecutionContext = Akka.system().dispatchers.lookup("akka.actor.contexts.file-processing")
     Future {
-      saveURL(file, url, clowderurl, apiKey, Some(user)).foreach { fixedfile =>
-        processFileBytes(fixedfile, new java.io.File(path), fileds)
-        files.setStatus(fixedfile.id, FileStatus.UPLOADED)
-        processFile(fixedfile, clowderurl, index, flagsFromPrevious, showPreviews, fileds, runExtractors, apiKey)
-        processDataset(file, fileds, folder, clowderurl, user, index, runExtractors, apiKey)
-        files.setStatus(fixedfile.id, FileStatus.PROCESSED)
+      try {
+        saveURL(file, url, clowderurl, apiKey, Some(user)).match{
+          case Some(fixedfile) => {
+            processFileBytes(fixedfile, new java.io.File(path), fileds)
+            files.setStatus(fixedfile.id, FileStatus.UPLOADED)
+            processFile(fixedfile, clowderurl, index, flagsFromPrevious, showPreviews, fileds, runExtractors, apiKey)
+            processDataset(file, fileds, folder, clowderurl, user, index, runExtractors, apiKey)
+            files.setStatus(fixedfile.id, FileStatus.PROCESSED)
+          }
+        }
+      } catch {
+        case _: Throwable => Logger.error(s"Error (${_}), url was not saved for ${file.id}")
       }
     }(fileExecutionContext)