Changeset 778 for trunk/packages/sipb-xen-base/files/usr/share

Timestamp:

Jul 29, 2008, 1:35:57 AM (16 years ago)

Author:

y_z

Message:

• moved more generic code into common package
• silently fail if cache fails
• load the configuration on module load
• produce a struct-based representation of the configuration
• allowing full exception messages for OSErrors (default behavior)
• added some dependencies specs

Location:

trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt

Files:

• common.py (added)
• config.py (modified) (3 diffs)

trunk/packages/sipb-xen-base/files/usr/share/python-support/sipb-xen-base/invirt/config.py

@@ -1 +1 @@
 import json, yaml
+from invirt.common import *
 from os import error, makedirs
 from os.path import dirname, getmtime
@@ -8 +9 @@
 try:    default_loader = yaml.CSafeLoader
 except: default_loader = yaml.SafeLoader
-
-def wrap(rsrc, func):
-    "Utility to that emulates with Python 2.5's `with closing(rsrc)`."
-    try: return func(rsrc)
-    finally: rsrc.close()
 
 def load(src_path = default_src_path,
@@ -31 +27 @@
         else:           do_refresh  = src_mtime > cache_mtime
 
+    if not do_refresh:
+        # try reading from the cache first
+        try: cfg = wrap(file(cache_path), lambda f: json.read(f.read()))
+        except: do_refresh = True
+
     if do_refresh:
         # reload the source and regenerate the cache
         cfg = wrap(file(src_path), lambda f: yaml.load(f, default_loader))
-        wrap(file(cache_path, 'w'), lambda f: f.write(json.write(cfg)))
-    else:
-        cfg = wrap(file(cache_path), lambda f: json.read(f.read()))
+        try: wrap(file(cache_path, 'w'), lambda f: f.write(json.write(cfg)))
+        except: pass # silent failure
     return cfg
 
+dicts = load()
+structs = dicts2struct(dicts)
+
 # vim:et:sw=4:ts=4