--- a/components/openstack/swift/files/swift-smf-method Tue Jun 10 14:07:48 2014 -0700
+++ b/components/openstack/swift/files/swift-smf-method Wed Jun 11 17:13:12 2014 -0700
@@ -32,6 +32,7 @@
"proxy-server": ["account", "container", "object"]
}
+
def start():
# All the Swift services do essentially the same thing, so there's no need
# to have different method executables. Just look at the FMRI and run the
@@ -47,8 +48,9 @@
cfgfile = "/etc/swift/%s-server.conf" % exepath.split("-")[1]
if not os.path.isfile(cfgfile):
print >> sys.stderr, "Missing configuration file"
- smf_include.smf_method_exit(smf_include.SMF_EXIT_ERR_CONFIG,
- "missing_config", "Missing configuration file")
+ smf_include.smf_method_exit(
+ smf_include.SMF_EXIT_ERR_CONFIG, "missing_config",
+ "Missing configuration file")
missing_rings = []
for ring in rings.get(exepath.split("-", 1)[1], ()):
@@ -57,9 +59,9 @@
missing_rings.append(ringfile)
if missing_rings:
print >> sys.stderr, "Missing ring(s): " + ", ".join(missing_rings)
- smf_include.smf_method_exit(smf_include.SMF_EXIT_ERR_CONFIG,
- "missing_ring",
- "Missing ring(s): " + ", ".join(missing_rings))
+ smf_include.smf_method_exit(
+ smf_include.SMF_EXIT_ERR_CONFIG, "missing_ring",
+ "Missing ring(s): " + ", ".join(missing_rings))
# This is the default recon_cache_path (from the config files) as well as
# the default run_dir (from the code).