#5 review fixes

zalando-stups · Aug 28, 2015 · 81cd667 · 81cd667
1 parent 97ace42
commit 81cd667
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/org/zalando/stups/mint/worker/job/run.clj b/src/org/zalando/stups/mint/worker/job/run.clj
@@ -43,8 +43,8 @@
                   (throw e))
                 (storage/update-status storage-url (:id app)
                                                    {:has_problems true
-                                                    :s3_errors (if (= "S3Exception" (:type (ex-data e)))
-                                                                   (inc (:s3_errors app)))
+                                                    :s3_errors (when (= "S3Exception" (:type (ex-data e)))
+                                                                 (inc (:s3_errors app)))
                                                     :message (str e)}
                                                    tokens)
                 (log/warn "Could not synchronize app %s because %s." (:id app) (str e))))))))

diff --git a/src/org/zalando/stups/mint/worker/job/sync_app.clj b/src/org/zalando/stups/mint/worker/job/sync_app.clj
@@ -20,11 +20,8 @@
     (log/debug "Start syncing app %s..." app-id)
     (if-not (> s3-errors
                max-errors)            
-            (let [bucket-writability (map #(list app-id (s3/writable? % app-id))
-                                          (:s3_buckets app))
-                  unwritable (map first
-                                  (remove second
-                                          bucket-writability))]
+            (let [unwritable (doall (filter #(not (s3/writable? %))
+                                            (:s3_buckets app)))]
               (if (seq unwritable)
                   (do
                     (log/debug "Skipping sync for app %s because there are unwritable S3 buckets: %s" unwritable)