From b733bc26925ed5892b421598ffd1614d3d373c56 Mon Sep 17 00:00:00 2001 From: William Brown Date: Thu, 20 Aug 2015 14:26:15 +0930 Subject: [PATCH 1/2] Reliability improviments to DS allocate functions --- lib389/__init__.py | 7 +++++-- lib389/tools.py | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib389/__init__.py b/lib389/__init__.py index 8dfe28f..519f04a 100644 --- a/lib389/__init__.py +++ b/lib389/__init__.py @@ -454,7 +454,8 @@ class DirSrv(SimpleLDAPObject): self.serverid = args.get(SER_SERVERID_PROP, None) self.groupid = args.get(SER_GROUP_ID, self.userid) self.backupdir = args.get(SER_BACKUP_INST_DIR, DEFAULT_BACKUPDIR) - self.prefix = args.get(SER_DEPLOYED_DIR) + # Allocate from the args, or use our env, or use / + self.prefix = args.get(SER_DEPLOYED_DIR, self.prefix ) # Those variables needs to be revisited (sroot for 64 bits) #self.sroot = os.path.join(self.prefix, "lib/dirsrv") @@ -763,7 +764,9 @@ class DirSrv(SimpleLDAPObject): SER_DEPLOYED_DIR: self.prefix, SER_BACKUP_INST_DIR: self.backupdir} content = formatInfData(args) - DirSrvTools.runInfProg(prog, content, verbose, prefix=self.prefix) + result = DirSrvTools.runInfProg(prog, content, verbose, prefix=self.prefix) + if result != 0: + raise Exception('Failed to run setup-ds.pl') def create(self): """ diff --git a/lib389/tools.py b/lib389/tools.py index d681172..3e84745 100644 --- a/lib389/tools.py +++ b/lib389/tools.py @@ -556,8 +556,8 @@ class DirSrvTools(object): print "timed out waiting to read from", cmd child_stdout.close() exitCode = pipe.wait() - if verbose: - print "%s returned exit code %s" % (prog, exitCode) + #if verbose: + log.debug("%s returned exit code %s" % (prog, exitCode)) return exitCode @staticmethod -- 2.4.3