Add better logging and ensure temp files are unlinked

EHRI · Nov 1, 2016 · 386d610 · 386d610
1 parent 0724a70
commit 386d610
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/libraries/Omeka/Storage/Adapter/AmazonS3.php b/libraries/Omeka/Storage/Adapter/AmazonS3.php
@@ -73,13 +73,16 @@ public function canStore()
      */
     public function store($source, $dest)
     {
-        $this->_s3->putObject([
+        $result = $this->_s3->putObject([
             'ACL' => $this->_getAcl(),
             'Bucket' => $this->_getBucket(),
             'Expiration' => $this->_getExpiration(),
             'SourceFile' => $source,
             'Key' => $dest
         ]);
+        $objectName = $result->get('ObjectURL');
+        _log("Omeka_Storage_Adapter_AmazonS3: Stored '$source' as: $objectName");
+        unlink($source);
     }
 
     /**
@@ -90,14 +93,16 @@ public function store($source, $dest)
      */
     public function move($source, $dest)
     {
-        $this->_s3->copy(
+        $result = $this->_s3->copy(
             $this->_getBucket(),
             $source,
             $this->_getBucket(),
             $dest,
             $this->_getAcl()
         );
         $this->delete($source);
+        $objectName = $result->get('ObjectURL');
+        _log("Omeka_Storage_Adapter_AmazonS3: Moved '$source' to: $objectName");
     }
 
     /**
@@ -111,6 +116,7 @@ public function delete($path)
             'Bucket' => $this->_getBucket(),
             'Key' => $path
         ]);
+        _log("Omeka_Storage_Adapter_AmazonS3: Deleted: $path");
     }
 
     /**