Changeset 778

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:

• debian/control (modified) (1 diff)
• files/usr/sbin/invirt-getconf (modified) (2 diffs)
• files/usr/share/python-support/sipb-xen-base/invirt/common.py (added)
• files/usr/share/python-support/sipb-xen-base/invirt/config.py (modified) (3 diffs)

trunk/packages/sipb-xen-base/debian/control

@@ -3 +3 @@
 Priority: extra
 Maintainer: SIPB Xen Project <sipb-xen@mit.edu>
-Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0), python-json (>= 3.4-2), python-yaml (>= 3.05-1andersk1)
+Build-Depends: cdbs (>= 0.4.23-1.1), debhelper (>= 4.1.0)
 Standards-Version: 3.7.2
 
 Package: sipb-xen-base
 Architecture: all
-Depends: ${misc:Depends}, 
+Depends: ${misc:Depends}, python-json (>= 3.4-2), python-yaml (>= 3.05)
 Description: Base configuration required for all SIPB xen servers
  This package includes apt configuration, .k5login and other files that

trunk/packages/sipb-xen-base/files/usr/sbin/invirt-getconf

@@ -2 +2 @@
 
 """
-invirt-getconf [-f FILE] KEY prints the configuration the option named KEY from
-the invirt configuration file FILE.  Keys are dot-separated paths into the YAML
+invirt-getconf loads an invirt configuration file (either the original YAML
+source or the faster-to-load JSON cache) and prints the configuration option
+with the given name (key).  Keys are dot-separated paths into the YAML
 configuration tree.  List indexes (0-based) are also treated as path
 components.
 
 (Due to this path language, certain restrictions are placed on the keys used in
-the YAML configuration, e.g. they cannot contain dots.)
+the YAML configuration; e.g., they cannot contain dots.)
 
 Examples:
@@ -58 +59 @@
                     '%s: index %s out of range' % (progress, component))
         print conf
-    except (invirt_exception, OSError), ex:
+    except invirt_exception, ex:
         print >> stderr, ex
         return 1

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