--- a/components/openstack/swift/files/swift-replicator-rsync Wed Jun 11 05:34:04 2014 -0700
+++ b/components/openstack/swift/files/swift-replicator-rsync Fri Jun 13 09:10:23 2014 -0700
@@ -25,8 +25,9 @@
def start():
cfgfile = "/etc/swift/rsyncd.conf"
if not os.path.isfile(cfgfile):
- 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")
# This is the default delivered in /etc/swift/rsyncd.conf
try:
@@ -40,16 +41,18 @@
proc = subprocess.Popen(cmdline)
except OSError as err:
print >> sys.stderr, "Error executing rsync: %s" % err
- smf_include.smf_method_exit(smf_include.SMF_EXIT_ERR_FATAL,
- "exec_error", "Error executing rsync: %s" % err)
+ smf_include.smf_method_exit(
+ smf_include.SMF_EXIT_ERR_FATAL, "exec_error",
+ "Error executing rsync: %s" % err)
ret = proc.wait()
if ret != 0:
print >> sys.stderr, "rsync daemon failed to start (see message above)"
print >> sys.stderr, "commandline:", " ".join(cmdline)
print >> sys.stderr, "exit code:", ret
- smf_include.smf_method_exit(smf_include.SMF_EXIT_ERR_FATAL,
- "exec_fail", "rsync daemon failed to start (see service log)")
+ smf_include.smf_method_exit(
+ smf_include.SMF_EXIT_ERR_FATAL, "exec_fail",
+ "rsync daemon failed to start (see service log)")
return int(smf_include.SMF_EXIT_OK)