X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=bluesky%2Fstore-s3.c;h=94594425846a1484b6217ddbe08961bc8379e47a;hb=8ff0fd08d6e1cc97cdb7e94b7cd97dc28c29e674;hp=03f497b278105e8045fe6f32a6ca135397199d5a;hpb=d9bdc90da5c143d76cf3efd3c39b9bd190fb3741;p=bluesky.git

diff --git a/bluesky/store-s3.c b/bluesky/store-s3.c
index 03f497b..9459442 100644
--- a/bluesky/store-s3.c
+++ b/bluesky/store-s3.c
@@ -3,7 +3,29 @@
  * Copyright (C) 2009  The Regents of the University of California
  * Written by Michael Vrable <mvrable@cs.ucsd.edu>
  *
- * TODO: Licensing
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
  */
 
 #include <stdint.h>
@@ -115,6 +137,7 @@ static void s3store_task(gpointer a, gpointer s)
 
     } else if (async->op == STORE_OP_PUT) {
         struct put_info info;
+        info.success = 0;
         info.val = async->data;
         info.offset = 0;
 
@@ -127,7 +150,11 @@ static void s3store_task(gpointer a, gpointer s)
         S3_put_object(&store->bucket, async->key, async->data->len, NULL, NULL,
                       &handler, &info);
 
-        async->result = 0;
+        if (info.success) {
+            async->result = 0;
+        } else {
+            g_warning("Error completing S3 put operation; client must retry!");
+        }
     }
 
     bluesky_store_async_mark_complete(async);
@@ -187,7 +214,7 @@ static gpointer s3store_new(const gchar *path)
     else
         store->bucket.bucketName = g_strdup(path);
     store->bucket.protocol = S3ProtocolHTTP;
-    store->bucket.uriStyle = S3UriStylePath;
+    store->bucket.uriStyle = S3UriStyleVirtualHost;
     store->bucket.accessKeyId = getenv("AWS_ACCESS_KEY_ID");
     store->bucket.secretAccessKey = getenv("AWS_SECRET_ACCESS_KEY");
 
@@ -251,6 +278,6 @@ static BlueSkyStoreImplementation store_impl = {
 
 void bluesky_store_init_s3(void)
 {
-    S3_initialize(NULL, S3_INIT_ALL);
+    S3_initialize(NULL, S3_INIT_ALL, NULL);
     bluesky_store_register(&store_impl, "s3");
 }