summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2011-04-13 01:46:00 +0000
committerAnand Avati <avati@gluster.com>2011-04-13 04:42:44 -0700
commitc0139158ae8992513e93932d8670b5db8605ead2 (patch)
treeec402362034874de50c9379df90d39e26aa5028c
parent7cf0dbcd300f554985ebde4759511c048927c53a (diff)
syncdaemon: minor fixes
- whitespace fix - remove superfluous imports Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 1570 (geosync related changes) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1570
-rw-r--r--xlators/features/marker/utils/syncdaemon/master.py3
-rw-r--r--xlators/features/marker/utils/syncdaemon/repce.py2
-rw-r--r--xlators/features/marker/utils/syncdaemon/resource.py1
3 files changed, 2 insertions, 4 deletions
diff --git a/xlators/features/marker/utils/syncdaemon/master.py b/xlators/features/marker/utils/syncdaemon/master.py
index fd5a2dcda3c..f6403fcf6ef 100644
--- a/xlators/features/marker/utils/syncdaemon/master.py
+++ b/xlators/features/marker/utils/syncdaemon/master.py
@@ -1,6 +1,5 @@
import os
import sys
-import threading
import time
import stat
import signal
@@ -106,7 +105,7 @@ class GMaster(object):
gap = min(10, gap)
self.slave.server.keep_alive(vi)
time.sleep(gap)
- t = threading.Thread(target=keep_alive)
+ t = Thread(target=keep_alive)
t.setDaemon(True)
t.start()
while True:
diff --git a/xlators/features/marker/utils/syncdaemon/repce.py b/xlators/features/marker/utils/syncdaemon/repce.py
index 1b8d0203cff..8b7e0ae94e2 100644
--- a/xlators/features/marker/utils/syncdaemon/repce.py
+++ b/xlators/features/marker/utils/syncdaemon/repce.py
@@ -57,7 +57,7 @@ class RepceServer(object):
while True:
self.q.put(recv(self.inf))
except EOFError:
- logging.info("terminating on reaching EOF.")
+ logging.info("terminating on reaching EOF.")
def worker(self):
while True:
diff --git a/xlators/features/marker/utils/syncdaemon/resource.py b/xlators/features/marker/utils/syncdaemon/resource.py
index d172462a70f..09ab9c3a49b 100644
--- a/xlators/features/marker/utils/syncdaemon/resource.py
+++ b/xlators/features/marker/utils/syncdaemon/resource.py
@@ -11,7 +11,6 @@ import socket
import logging
import tempfile
import threading
-import time
from ctypes import *
from ctypes.util import find_library
from errno import EEXIST, ENOENT, ENODATA, ENOTDIR, ELOOP, EISDIR