Skip to content
This repository has been archived by the owner on May 10, 2023. It is now read-only.

Commit

Permalink
[arclink] Replace SC3 specific exceptions with Python exceptions
Browse files Browse the repository at this point in the history
  • Loading branch information
gempa-jabe committed Jul 28, 2017
1 parent 3f94e4f commit 473a168
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
3 changes: 1 addition & 2 deletions src/arclink/apps/misc/sync_db.py
Expand Up @@ -184,8 +184,7 @@ def initConfiguration(self):

try:
self.dcid = self.configGetString("datacenterID")

except Config.Exception:
except Exception:
pass

return True
Expand Down
24 changes: 12 additions & 12 deletions src/arclink/apps/reqhandler/reqhandler.py
Expand Up @@ -390,26 +390,26 @@ def initConfiguration(self):
## Those are necessary.
try:
self.organization = self.configGetString("organization")
except Config.Exception:
except Exception:
logs.error("organization name not specified")
return False

try:
self.reqdir = e.absolutePath(self.configGetString("request_dir"))
except Config.Exception:
except Exception:
logs.error("request data directory not specified")
return False

try:
self.dcid = self.configGetString("datacenterID")
except Config.Exception:
except Exception:
logs.error("datacenter/archive ID not specified")
return False

## From those we can supply a default
try:
self.trackdir = e.absolutePath(self.configGetString("reqhandler.trackdir"))
except Config.Exception:
except Exception:
self.trackdir = None

try:
Expand All @@ -418,45 +418,45 @@ def initConfiguration(self):
self.trackdb = True
else:
self.trackdb = False
except Config.Exception:
except Exception:
self.trackdb = False

try:
self.nrtdir = e.absolutePath(self.configGetString("reqhandler.nrtdir"))
except Config.Exception:
except Exception:
self.nrtdir = e.absolutePath("@ROOTDIR@/var/lib/archive")

try:
self.archdir = e.absolutePath(self.configGetString("reqhandler.archdir"))
except Config.Exception:
except Exception:
self.archdir = "/iso_sds"

try:
self.isodir = e.absolutePath(self.configGetString("reqhandler.isodir"))
except Config.Exception:
except Exception:
self.isodir = "/iso_arc"

try:
self.gfaurl = self.configGetString("reqhandler.gfaurl")
except Config.Exception:
except Exception:
self.gfaurl = None

try:
self.filedb = e.absolutePath(self.configGetString("reqhandler.filedb"))
except Config.Exception:
except Exception:
self.filedb = None

try:
self.subnodelist = e.absolutePath(self.configGetString("reqhandler.subnodelist"))
except Config.Exception:
except Exception:
self.subnodelist = None

try:
self.maxsize = self.configGetInt("reqhandler.maxsize")
except Core.TypeConversionException:
logs.error("invalid maximum request size")
return False
except Config.Exception:
except Exception:
self.maxsize = 500

return True
Expand Down

0 comments on commit 473a168

Please sign in to comment.