Merge "Make .expiring_objects account name configurable"

etc/object-expirer.conf-sample

@@ -26,6 +26,7 @@
 [object-expirer]
 # interval = 300
 # auto_create_account_prefix = .
+# expiring_objects_account_name = expiring_objects
 # report_interval = 300
 # concurrency is the level of concurrency o use to do the work, this value
 # must be set to at least 1

etc/object-server.conf-sample

@@ -9,6 +9,7 @@
 # mount_check = true
 # disable_fallocate = false
 # expiring_objects_container_divisor = 86400
+# expiring_objects_account_name = expiring_objects
 #
 # Use an integer to override the number of pre-forked processes that will
 # accept connections.

etc/proxy-server.conf-sample

@@ -33,6 +33,7 @@
 # key_file = /etc/swift/proxy.key
 #
 # expiring_objects_container_divisor = 86400
+# expiring_objects_account_name = expiring_objects
 #
 # You can specify default log routing here if you want:
 # log_name = swift

swift/obj/expirer.py

@@ -44,7 +44,7 @@ class ObjectExpirer(Daemon):
         self.interval = int(conf.get('interval') or 300)
         self.expiring_objects_account = \
             (conf.get('auto_create_account_prefix') or '.') + \
-            'expiring_objects'
+            (conf.get('expiring_objects_account_name') or 'expiring_objects')
         conf_path = conf.get('__file__') or '/etc/swift/object-expirer.conf'
         request_tries = int(conf.get('request_tries') or 3)
         self.swift = InternalClient(conf_path,

swift/obj/server.py

@@ -92,7 +92,7 @@ class ObjectController(object):
                 self.allowed_headers.add(header)
         self.expiring_objects_account = \
             (conf.get('auto_create_account_prefix') or '.') + \
-            'expiring_objects'
+            (conf.get('expiring_objects_account_name') or 'expiring_objects')
         self.expiring_objects_container_divisor = \
             int(conf.get('expiring_objects_container_divisor') or 86400)
         # Initialization was successful, so now apply the network chunk size

swift/proxy/server.py

@@ -109,7 +109,7 @@ class Application(object):
             config_true_value(conf.get('account_autocreate', 'no'))
         self.expiring_objects_account = \
             (conf.get('auto_create_account_prefix') or '.') + \
-            'expiring_objects'
+            (conf.get('expiring_objects_account_name') or 'expiring_objects')
         self.expiring_objects_container_divisor = \
             int(conf.get('expiring_objects_container_divisor') or 86400)
         self.max_containers_per_account = \