summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2011-03-17 00:46:38 +0000
committerVijay Bellur <vijay@dev.gluster.com>2011-03-17 23:27:28 -0700
commit223bfc4d19a2b7cccc62e05129e09591233edc44 (patch)
treeeac3ce7bec9cde4aa5e3485f7468927de61f49ec
parent236600d7de4e900ad3905908853785dc2ac6629f (diff)
syncdaemon: fix up exit value
Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 2380 (TypeError: 'str' object is not callable) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2380
-rw-r--r--xlators/features/marker/utils/syncdaemon/gsyncd.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/xlators/features/marker/utils/syncdaemon/gsyncd.py b/xlators/features/marker/utils/syncdaemon/gsyncd.py
index ba3141f6651..e34a6bcb233 100644
--- a/xlators/features/marker/utils/syncdaemon/gsyncd.py
+++ b/xlators/features/marker/utils/syncdaemon/gsyncd.py
@@ -153,6 +153,7 @@ def main():
# but this handler neither does
# signal.signal(signal.SIGTERM, finalize)
GLogger.setup()
+ exval = 0
try:
try:
main_i()
@@ -161,11 +162,12 @@ def main():
if exc != SystemExit:
logging.exception("FAIL: ")
sys.stderr.write("failed with %s.\n" % exc.__name__)
- sys.exit(1)
+ exval = 1
+ sys.exit(exval)
finally:
finalize()
# force exit in non-main thread too
- os._exit(1)
+ os._exit(exval)
def main_i():
rconf = {'go_daemon': 'should'}