Merge pull request notmyname#11 from notmyname/metadata_check_fix

fixed issue notmyname#10 to cast metadata key to lower before comparing it
dellcloudedge · Aug 15, 2011 · f8cfcfe · f8cfcfe
2 parents 26d8254 + b3f79f7
commit f8cfcfe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/slogging/access_log_delivery.py b/slogging/access_log_delivery.py
@@ -156,7 +156,7 @@ def get_container_save_log_flag(self, account, container):
             metadata = self.internal_proxy.get_container_metadata(account,
                                                                   container)
             val = metadata.get(self.metadata_key)
-            flag = val in TRUE_VALUES
+            flag = val.lower() in TRUE_VALUES
             self.memcache.set(key, flag, timeout=self.frequency)
         return flag
 

diff --git a/test_slogging/unit/test_access_log_delivery.py b/test_slogging/unit/test_access_log_delivery.py
@@ -157,6 +157,9 @@ def test_get_container_save_log_flag(self):
         def my_get_metadata_true(*a, **kw):
             return {p.metadata_key: 'yes'}
 
+        def my_get_metadata_true_upper(*a, **kw):
+            return {p.metadata_key: 'YES'}
+
         def my_get_metadata_false(*a, **kw):
             return {p.metadata_key: 'no'}
         p.internal_proxy.get_container_metadata = my_get_metadata_false
@@ -169,6 +172,11 @@ def my_get_metadata_false(*a, **kw):
         res = p.get_container_save_log_flag('a', 'c2')
         expected = True
         self.assertEquals(res, expected)
+        p.internal_proxy.get_container_metadata = my_get_metadata_true_upper
+        p.memcache = FakeMemcache()
+        res = p.get_container_save_log_flag('a', 'c2')
+        expected = True
+        self.assertEquals(res, expected)
 
     def test_process_one_file(self):
         with temptree([]) as t: