diff options
| author | Simo Sorce <simo@redhat.com> | 2014-09-08 15:55:34 -0400 |
|---|---|---|
| committer | Patrick Uiterwijk <puiterwijk@redhat.com> | 2014-09-24 20:31:14 +0200 |
| commit | 9e45a0dda4cfa26b531a423fc8b1c4b10d382a0f (patch) | |
| tree | 556822a7e6ff5847703f3c6640f32530a53d8864 /ipsilon/ipsilon | |
| parent | d00990c389e98dc62a59020e4a79cfe657f88f89 (diff) | |
| download | ipsilon-9e45a0dda4cfa26b531a423fc8b1c4b10d382a0f.tar.gz ipsilon-9e45a0dda4cfa26b531a423fc8b1c4b10d382a0f.tar.xz ipsilon-9e45a0dda4cfa26b531a423fc8b1c4b10d382a0f.zip | |
Refactor the data store a bit
Reduce code duplication, and clearly separates admin and user dbs.
Move plugin wrapper away and let plugin code use native functions.
This patch also changes the indexed data to use a uuid and assumes
2 identical uuid cannot be created concurrently.
Signed-off-by: Simo Sorce <simo@redhat.com>
Reviewed-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Diffstat (limited to 'ipsilon/ipsilon')
| -rwxr-xr-x | ipsilon/ipsilon | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipsilon/ipsilon b/ipsilon/ipsilon index 8cabc85..9700106 100755 --- a/ipsilon/ipsilon +++ b/ipsilon/ipsilon @@ -23,7 +23,7 @@ import glob import os import atexit import cherrypy -from ipsilon.util.data import Store +from ipsilon.util.data import AdminStore from ipsilon.util import page from ipsilon.root import Root from jinja2 import Environment, FileSystemLoader @@ -55,8 +55,8 @@ cherrypy.config.update(cfgfile) nuke_session_locks() -datastore = Store() -admin_config = datastore.get_admin_config() +datastore = AdminStore() +admin_config = datastore.load_config() for option in admin_config: cherrypy.config[option] = admin_config[option] |