git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with HEAD, close aly's branch.
[nepi.git]
/
src
/
nepi
/
util
/
server.py
diff --git
a/src/nepi/util/server.py
b/src/nepi/util/server.py
index
a084705
..
675ca38
100644
(file)
--- a/
src/nepi/util/server.py
+++ b/
src/nepi/util/server.py
@@
-9,14
+9,14
@@
import os
import os.path
import resource
import select
import os.path
import resource
import select
-import s
ocket
+import s
hutil
import signal
import signal
+import socket
import sys
import subprocess
import threading
import time
import traceback
import sys
import subprocess
import threading
import time
import traceback
-import signal
import re
import tempfile
import defer
import re
import tempfile
import defer
@@
-76,8
+76,10
@@
def eintr_retry(func):
return rv
class Server(object):
return rv
class Server(object):
- def __init__(self, root_dir = ".", log_level = DC.ERROR_LEVEL, environment_setup = ""):
+ def __init__(self, root_dir = ".", log_level = DC.ERROR_LEVEL,
+ environment_setup = "", clean_root = False):
self._root_dir = root_dir
self._root_dir = root_dir
+ self._clean_root = clean_root
self._stop = False
self._ctrl_sock = None
self._log_level = log_level
self._stop = False
self._ctrl_sock = None
self._log_level = log_level
@@
-110,6
+112,8
@@
class Server(object):
# build root folder
root = os.path.normpath(self._root_dir)
# build root folder
root = os.path.normpath(self._root_dir)
+ if os.path.exists(root) and self._clean_root:
+ shutil.rmtree(root)
if not os.path.exists(root):
os.makedirs(root, 0755)
if not os.path.exists(root):
os.makedirs(root, 0755)
@@
-226,7
+230,7
@@
class Server(object):
try:
msg = self.recv_msg(conn)
except socket.timeout, e:
try:
msg = self.recv_msg(conn)
except socket.timeout, e:
- self.log_error("SERVER recv_msg: connection timedout ")
+
#
self.log_error("SERVER recv_msg: connection timedout ")
continue
if not msg:
continue
if not msg: