| 10 |
|
self._cwd_dir = os.getcwd()+'/' |
| 11 |
|
self._top_dir = top_dir # top working directory |
| 12 |
|
|
| 13 |
+ |
self._user_out_dir = '' |
| 14 |
+ |
self._user_log_dir = '' |
| 15 |
+ |
if 'USER.outputdir' in cfg_params.keys(): |
| 16 |
+ |
self._user_out_dir = os.path.abspath(cfg_params['USER.outputdir']) |
| 17 |
+ |
if 'USER.logdir' in cfg_params.keys(): |
| 18 |
+ |
self._user_log_dir = os.path.abspath(cfg_params['USER.logdir']) |
| 19 |
|
#Matteo: Necessary to manage user ui_working_dir |
| 20 |
|
if 'USER.ui_working_dir' in cfg_params.keys(): |
| 21 |
|
self._top_dir = os.path.abspath(cfg_params['USER.ui_working_dir']) |
| 22 |
|
self._pathForTgz = self._top_dir |
| 23 |
|
|
| 24 |
< |
self._log_dir = cfg_params.get("USER.logdir",self._top_dir + '/log') # log-directory |
| 24 |
> |
# self._res_dir = cfg_params.get("USER.outputdir", self._top_dir + '/res') # dir to store job results |
| 25 |
> |
# self._log_dir = ("USER.logdir",self._top_dir + '/log') # log-directory |
| 26 |
> |
self._log_dir = self._top_dir + '/log' # log-directory |
| 27 |
|
self._job_dir = self._top_dir + '/job' # job pars, scripts, jdl's |
| 28 |
< |
self._res_dir = cfg_params.get("USER.outputdir", self._top_dir + '/res') # dir to store job results |
| 28 |
> |
self._res_dir = self._top_dir + '/res' # dir to store job results |
| 29 |
|
self._share_dir = self._top_dir + '/share' # directory for common stuff |
| 30 |
|
|
| 31 |
|
#Matteo: Necessary to manage user ui_working_dir |
| 53 |
|
if not os.listdir(self._top_dir): |
| 54 |
|
os.mkdir(self._job_dir) |
| 55 |
|
os.mkdir(self._share_dir) |
| 56 |
+ |
os.mkdir(self._res_dir) |
| 57 |
+ |
os.mkdir(self._log_dir) |
| 58 |
|
pass |
| 59 |
|
|
| 60 |
|
# Some more check for _res_dir, since it can be user defined |
| 61 |
< |
if not os.path.exists(self._res_dir): |
| 62 |
< |
try: |
| 63 |
< |
os.mkdir(self._res_dir) |
| 64 |
< |
except: |
| 65 |
< |
msg = 'Cannot mkdir ' + self._res_dir + ' Check permission' |
| 61 |
> |
if self._user_out_dir != '': |
| 62 |
> |
if not os.path.exists(self._user_out_dir): |
| 63 |
> |
try: |
| 64 |
> |
os.mkdir(self._user_out_dir) |
| 65 |
> |
except: |
| 66 |
> |
msg = 'Cannot mkdir ' + self._user_out_dir + ' Check permission' |
| 67 |
> |
raise CrabException(msg) |
| 68 |
> |
if os.listdir(self._user_out_dir): |
| 69 |
> |
msg = self._user_out_dir + ' already exists and is not empty. Please remove it before create new task' |
| 70 |
|
raise CrabException(msg) |
| 57 |
– |
if os.listdir(self._res_dir): |
| 58 |
– |
msg = self._res_dir + ' already exists and is not empty. Please remove it before create new task' |
| 59 |
– |
raise CrabException(msg) |
| 71 |
|
# ditto for _log_dir |
| 72 |
< |
if not os.path.exists(self._log_dir): |
| 73 |
< |
try: |
| 74 |
< |
os.mkdir(self._log_dir) |
| 75 |
< |
except: |
| 76 |
< |
msg = 'Cannot mkdir ' + self._log_dir + ' Check permission' |
| 72 |
> |
if self._user_log_dir != '': |
| 73 |
> |
if not os.path.exists(self._user_log_dir): |
| 74 |
> |
try: |
| 75 |
> |
os.mkdir(self._user_log_dir) |
| 76 |
> |
except: |
| 77 |
> |
msg = 'Cannot mkdir ' + self._user_log_dir + ' Check permission' |
| 78 |
> |
raise CrabException(msg) |
| 79 |
> |
pass |
| 80 |
> |
if os.listdir(self._user_log_dir): |
| 81 |
> |
msg = self._user_log_dir + ' already exists and is not empty. Please remove it before create new task' |
| 82 |
|
raise CrabException(msg) |
| 67 |
– |
pass |
| 68 |
– |
if os.listdir(self._log_dir): |
| 69 |
– |
msg = self._log_dir + ' already exists and is not empty. Please remove it before create new task' |
| 70 |
– |
raise CrabException(msg) |
| 83 |
|
return |
| 84 |
|
|
| 85 |
|
def delete(self): |
