Changeset d3c8759 for fedd/federation/dragon_access.py

Timestamp:

May 25, 2010 11:15:55 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

f038da1

Parents:

da2208a

Message:

Wholesale change of IOError to EnvironmentError? for file operations. Lots of
uncaught EnvironmentErrors? were causing spurious error conditions, e.g. on disk
full.

File:

• fedd/federation/dragon_access.py (modified) (4 diffs)

fedd/federation/dragon_access.py

@@ -219 +219 @@
                 f = open(self.state_filename, 'w')
                 pickle.dump(self.state, f)
-            except IOError, e:
+            except EnvironmentError, e:
                 self.log.error("Can't write file %s: %s" % \
                         (self.state_filename, e))
@@ -240 +240 @@
                 self.log.debug("[read_state]: Read state from %s" % \
                         self.state_filename)
-            except IOError, e:
+            except EnvironmentError, e:
                 self.log.warning(("[read_state]: No saved state: " +\
                         "Can't open %s: %s") % (self.state_filename, e))
@@ -414 +414 @@
                 print >>f, alloc_cert
                 f.close()
-            except IOError, e:
+            except EnvironmentError, e:
                 raise service_error(service_error.internal, 
                         "Can't open %s/%s : %s" % (self.certdir, aid, e))
@@ -711 +711 @@
                 call(cmd, cwd=self.cli_dir, stdout=f, stderr=f, close_fds=True)
                 f.close()
-            except IOError, e:
+            except EnvironmentError, e:
                 raise service_error(service_error.internal, 
                         "Failed to open /dev/null: %s" % e)