Changeset 21895

Timestamp:

04/20/09 12:31:45 (1 year ago)

Author:

piotras

Message:

Configuration file allows to declare any paths. Fixes #1074.

Files:

• branches/vinland/core/midgard/conf.d/midgard.conf.example (modified) (2 diffs)
• branches/vinland/core/midgard/src/mgdschema.c (modified) (2 diffs)
• branches/vinland/core/midgard/src/midgard.c (modified) (2 diffs)
• branches/vinland/core/midgard/src/midgard_config.c (modified) (29 diffs)
• branches/vinland/core/midgard/src/midgard_config.h (modified) (3 diffs)
• branches/vinland/core/midgard/src/midgard_connection.c (modified) (5 diffs)
• branches/vinland/core/midgard/src/midgard_core_config.h (modified) (1 diff)
• branches/vinland/core/midgard/src/midgard_dbus.c (modified) (2 diffs)
• branches/vinland/core/midgard/src/midgard_schema.h (modified) (1 diff)
• branches/vinland/core/midgard/src/midgard_utils.h (modified) (1 diff)
• branches/vinland/core/midgard/test/midgard-schema.c (modified) (3 diffs)

branches/vinland/core/midgard/conf.d/midgard.conf.example

@@ -2 +2 @@
-# Do not create config files with conf extension
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#Database type, by default MySQL
@@ -22 +40 @@
-#Default language used by application. Unknown by default.
-#DefaultLanguage=pl
-
-#Full path to directory where blobs are stored.
-#By default we set /var/lib/midgard/blobs/DATABASE_NAME
-#/var/lib depends on prefix which was set for midgard-core
-Blobdir=
-
-#Full path to local schema directory.
-#By default all schema are read from /usr/share/midgard/schema directory.
-#/usr/share depends on prefix which was set for midgard-core
-#SchemaDir=
-
-#Full path to logfile. In none is defined output will be printed to stdout.

branches/vinland/core/midgard/src/mgdschema.c

@@ -1519 +1519 @@
-
-/* Initializes basic Midgard classes */
-
+, const gchar *path
-{       
-        g_assert(self != NULL);
-
-/* Check if common MgdObjects.xml exists. And read. */
-const gchar *
+if (path == NULL)
+       
-
-        if (g_file_test(path, G_FILE_TEST_IS_DIR)) {
@@ -1534 +1534 @@
-        if (!g_file_test(path, G_FILE_TEST_EXISTS)) {
-
-debug("Common MgdObject.xml file (%s) doesn't exist. Ignoring common types then
+warning("Common MgdObjects.xml file (%s) doesn't exist
-                return;
-        }

branches/vinland/core/midgard/src/midgard.c

@@ -31 +31 @@
-#include "midgard_sitegroup.h"
-#include "midgard_collector.h"
+#include <libgda/libgda.h>
-
-const char *midgard_version()
@@ -40 +41 @@
-{       
-        GType type;
+        /* g_type_init_with_debug_flags(G_TYPE_DEBUG_OBJECTS | G_TYPE_DEBUG_NONE); */
-
-
-
+
+
+
+
+
-
-        type = MIDGARD_TYPE_BLOB;

branches/vinland/core/midgard/src/midgard_config.c

@@ -49 +49 @@
-        MIDGARD_CONFIG_DBPASS, 
-        MIDGARD_CONFIG_HOST,
-        MIDGARD_CONFIG_BLOBDIR,
-        MIDGARD_CONFIG_LOGFILENAME,
-        MIDGARD_CONFIG_SCHEMADIR,
-        MIDGARD_CONFIG_DEFAULT_LANG,
-        MIDGARD_CONFIG_LOGLEVEL,
@@ -61 +59 @@
-        MIDGARD_CONFIG_MGDPASSWORD,
-        MIDGARD_CONFIG_AUTHTYPE,
-
+
+
+
+
+
-};
-
@@ -104 +106 @@
-        iconf = g_new(mdirs,1);
-        
-
+
+
-                /* Set typical FSH directory */
-                iconf->confdir = g_strconcat("/etc/", MIDGARD_PACKAGE_NAME, "/conf.d", NULL);
-                iconf->blobdir = g_strconcat("/var/lib/", MIDGARD_PACKAGE_NAME, "/blobs", NULL);
+                iconf->cachedir = g_strconcat("/var/cache/", MIDGARD_PACKAGE_NAME, NULL);
+                iconf->vardir = g_strconcat("/var/lib/", MIDGARD_PACKAGE_NAME, NULL);
+
-        } else {
+
-                /* Set any directory which follows midgard prefix */
-                iconf->confdir = g_strconcat(MIDGARD_LIB_PREFIX, "/etc/", 
@@ -114 +121 @@
-                iconf->blobdir = g_strconcat(MIDGARD_LIB_PREFIX, "/var/lib/", 
-                                MIDGARD_PACKAGE_NAME, "/blobs", NULL);
+                iconf->cachedir = g_strconcat(MIDGARD_LIB_PREFIX, "/var/cache/", 
+                                MIDGARD_PACKAGE_NAME, NULL);
+                iconf->vardir = g_strconcat(MIDGARD_LIB_PREFIX, "/var/lib/", 
+                                MIDGARD_PACKAGE_NAME, NULL);
-        }
-
-        /* Set blobdir to /var/local when /usr/local was set as prefix */
-        if (g_str_equal(MIDGARD_LIB_PREFIX, "/usr/local")) {
+
-                iconf->blobdir = g_strconcat("/var/local/lib/", MIDGARD_PACKAGE_NAME, 
-                                "/blobs", NULL);
+                iconf->cachedir = g_strconcat("/var/local/cache/", MIDGARD_PACKAGE_NAME, NULL);
+                iconf->vardir = g_strconcat("/var/local/lib/", MIDGARD_PACKAGE_NAME, NULL);
+
-        }
-        
@@ -126 +141 @@
-
-        return iconf;
-
-        /* TODO, this probably could be ignored, but te point is 
-         * to check if configuration dir ( usualy /etc/midgard/conf.d ) 
-         * is readable. However it fails when user manages his own home
-         * configuration file. Error handling shoudl be done when configuration 
-         * file ( particular one ) is opened. */
-        /*
-        dir = g_dir_open(iconf->confdir, 0, NULL);
-        if (dir == NULL ) {
-                // No idea at this moment how to create this directory and copy example file
-                // when midgard-core is installed  
-                g_error("Unable to open %s directory" , iconf->confdir);
-                g_free(iconf->confdir);
-                g_free(iconf->blobdir);
-                g_free(iconf->sharedir);
-                iconf = NULL;
-                return NULL;
-        } else {
-                g_dir_close(dir);
-                return iconf;
-        }
-        */
-
-        /* should not be reached */
-        iconf = NULL;
-        return NULL;
-}
-
@@ -157 +146 @@
-{
-        if (!(iconf && *iconf)) return;
+
-        g_free((*iconf)->confdir);
-        g_free((*iconf)->blobdir);
-        g_free((*iconf)->sharedir);
+        g_free((*iconf)->vardir);
+        g_free((*iconf)->cachedir);
-
-        g_free(*iconf);
@@ -194 +186 @@
-void __create_log_dir(const gchar *path)
-{
-
-
-
-
+
-                return;
-        
@@ -224 +213 @@
-        /* Get database type */
-        self->priv->dbtype = MIDGARD_DB_TYPE_MYSQL;
-
-
-
+
+
-                g_free(tmpstr);
-                tmpstr = g_strdup("MySQL");
-        }
-
+
-        __set_dbtype(self, tmpstr);
-        g_free(tmpstr);
-                
-        /* Get host name or IP */
-
+Midgard
-        if(tmpstr == NULL)
-                tmpstr = g_strdup("localhost");
@@ -244 +232 @@
-                        
-        /* Get database name */
-
-
-
-
+
+
-                g_free(self->database);
-
+
+
-        g_free(tmpstr);
-        
+        
-        /* Get database's username */
-
-
-
-
+
+
-                g_free(self->dbuser);
-
+
+
-        g_free(tmpstr);
-                
-        /* Get password for database user */
-
-
-
-
+
+
-                g_free(self->dbpass);
-
+
+
-        g_free(tmpstr);
-
-        /* Get default language */
-
-
-
-
+
+
+
-                self->default_lang = g_strdup(tmpstr);
-
+
-        g_free(tmpstr);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        /* Get log filename */
-
+Midgard
-        GIOChannel *channel = NULL;
-        if(tmpstr != NULL && !g_str_equal(tmpstr, "")) {
@@ -328 +295 @@
-        
-        /* Get log level */
-
+Midgard
-        if(tmpstr == NULL)
-                tmpstr = g_strdup("warn");
@@ -338 +305 @@
-
-        /* Get database creation mode */
-
+Midgard
-        self->tablecreate = tmpbool;
-        
-
-        /* Get database update mode */
-
+Midgard
-        self->tableupdate = tmpbool;
-
-        /* Get SG admin username */
-
-
+Midgard
+ && *tmpstr != '\0'
-                if(self->mgdusername)
-                        g_free(self->mgdusername);
@@ -356 +323 @@
-        
-        /* Get SG admin password */
-
-
+Midgard
+ && *tmpstr != '\0'
-                if(self->mgdpassword)
-                        g_free(self->mgdpassword);
@@ -365 +332 @@
-        
-        /* Get test mode */
-
+Midgard
-        self->testunit = tmpbool;
-        
-        /* Get auth type */
-
+Midgard
-        midgard_config_set_authtype(self, (const gchar *)tmpstr);
-        g_free(tmpstr);
-        
-        /* Get Pam file */
-
+Midgard
-        if(tmpstr == NULL)
-                tmpstr = g_strdup("midgard");
@@ -381 +348 @@
-
-        /* Disable threads */
-
+Midgard
-        self->gdathreads = tmpbool;
+
+        /* DIRECTORIES */
+        
+        /* BlobDir */
+        tmpstr = g_key_file_get_string(keyfile, "MidgardDir", "BlobDir", NULL);
+        if(tmpstr != NULL && *tmpstr != '\0') {
+
+                g_free(self->blobdir);
+                self->blobdir = g_strdup(tmpstr);
+                g_free(tmpstr);
+        
+        } else {
+
+                g_free(self->blobdir);
+                self->blobdir = 
+                        g_strconcat(iconf->blobdir, "/", self->database, NULL);
+
+        }
+
+        /* ShareDir */
+        tmpstr = g_key_file_get_string(keyfile, "MidgardDir", "ShareDir", NULL);
+        if(tmpstr == NULL || *tmpstr == '\0') {
+
+                g_free(self->sharedir);
+                self->sharedir = g_strdup(iconf->sharedir);
+
+        } else {
+
+                g_free(self->sharedir);
+                self->sharedir = g_strdup(tmpstr);
+                g_free(tmpstr);
+        }
+
+        /* VarDir */
+        tmpstr = g_key_file_get_string(keyfile, "MidgardDir", "VarDir", NULL);
+        if(tmpstr == NULL || *tmpstr == '\0') {
+
+                g_free(self->vardir);
+                self->vardir = g_strdup(iconf->vardir);
+
+        } else {
+
+                g_free(self->vardir);
+                self->vardir = g_strdup(tmpstr);
+                g_free(tmpstr);
+        }
+
+        /* CacheDir */
+        tmpstr = g_key_file_get_string(keyfile, "MidgardDir", "ShareDir", NULL);
+        if(tmpstr == NULL || *tmpstr == '\0') {
+
+                g_free(self->cachedir);
+                self->cachedir = g_strdup(iconf->cachedir);
+
+        } else {
+
+                g_free(self->cachedir);
+                self->cachedir = g_strdup(tmpstr);
+                g_free(tmpstr);
+        }
+
+        /* SchemaDir */
+        g_free(self->schemadir);
+        self->schemadir = g_build_path(G_DIR_SEPARATOR_S, self->sharedir, "schema", NULL);
-
-        /* We will free it when config is unref */
@@ -742 +773 @@
-                g_object_get_property(G_OBJECT(self), (gchar*)props[i]->name, &pval);
-
+                const gchar *keygroup = "MidgardDatabase";
+
+                if (g_str_equal(props[i]->name, "sharedir")
+                                || g_str_equal(props[i]->name, "vardir")
+                                || g_str_equal(props[i]->name, "cachedir")
+                                || g_str_equal(props[i]->name, "blobdir")) 
+                {       
+                        keygroup = "MidgardDir";
+                }
+
+
-                switch(props[i]->value_type){
-        
@@ -749 +791 @@
-                                        tmpstr = "";
-                                g_key_file_set_string(self->priv->keyfile,
-"Database"
+keygroup
-                                                nick, tmpstr);
-                                break;
@@ -755 +797 @@
-                        case G_TYPE_BOOLEAN:
-                                g_key_file_set_boolean(self->priv->keyfile,
-"Database"
+keygroup
-                                                nick, 
-                                                g_value_get_boolean(&pval));
@@ -761 +803 @@
-                }
-
-"Database"
+keygroup
-                                g_param_spec_get_blurb(props[i]), NULL);
-                g_value_unset(&pval);
@@ -1057 +1099 @@
-static void __config_struct_new(MidgardConfig *self)
-{
+        self->dbtype = g_strdup("MySQL");
-        self->mgdusername = g_strdup("root");
-        self->mgdpassword = g_strdup("password");
@@ -1063 +1106 @@
-        self->dbuser = g_strdup("midgard");
-        self->dbpass = g_strdup("midgard");
-        self->blobdir = NULL;
-        self->logfilename = NULL;
-        self->schemadir = g_strdup(MIDGARD_LSCHEMA_DIR);;
-        self->default_lang = NULL;
-        self->loglevel = g_strdup("warn");
-        self->pamfile = NULL;
+
+        /* MidgardDir */
+        self->blobdir = NULL;
+        self->sharedir = NULL;
+        self->vardir = NULL;
+        self->cachedir = NULL;
+        self->schemadir = NULL;
+        self->schemadir = g_strdup(MIDGARD_LSCHEMA_DIR);
-}
-
@@ -1085 +1134 @@
-        if(self->dbpass)
-                g_free(self->dbpass);
-        if(self->blobdir)
-                g_free(self->blobdir);
-        if(self->logfilename)
-                g_free(self->logfilename);
@@ -1109 +1156 @@
-                self = NULL;
-        }
+
+        /* MidgardDir */
+        if(self->blobdir)
+                g_free(self->blobdir);
+        self->blobdir = NULL;
+
+        if(self->sharedir)
+                g_free(self->sharedir);
+        self->sharedir = NULL;
+
+        if(self->cachedir)
+                g_free(self->cachedir);
+        self->cachedir = NULL;
+
+        if(self->vardir)
+                g_free(self->vardir);
+        self->vardir = NULL;
-}
-
@@ -1434 +1498 @@
-                        break;
-
-                case MIDGARD_CONFIG_BLOBDIR:
-                        g_free(self->blobdir);
-                        self->blobdir = g_value_dup_string(value);
-                        break;
-
-                case MIDGARD_CONFIG_LOGFILENAME:
-                        g_free(self->logfilename);
-                        self->logfilename = g_value_dup_string(value);
-                        break;
-
-                case MIDGARD_CONFIG_SCHEMADIR:
-                        g_free(self->schemadir);
-                        self->schemadir = g_value_dup_string(value);
-                        break;
-
@@ -1490 +1544 @@
-                        break;
-
+                /* MidgardDir */
+                case MIDGARD_CONFIG_BLOBDIR:
+                        g_free(self->blobdir);
+                        self->blobdir = g_value_dup_string(value);
+                        break;
+
+                case MIDGARD_CONFIG_SHAREDIR:
+                        g_free(self->sharedir);
+                        self->sharedir = g_value_dup_string(value);
+                        break;
+
+                case MIDGARD_CONFIG_VARDIR:
+                        g_free(self->vardir);
+                        self->vardir = g_value_dup_string(value);
+                        break;
+
+                case MIDGARD_CONFIG_CACHEDIR:
+                        g_free(self->cachedir);
+                        self->cachedir = g_value_dup_string(value);
+                        break;
+
-                default:
-                        G_OBJECT_WARN_INVALID_PROPERTY_ID(object,property_id,pspec);
@@ -1524 +1599 @@
-                        break;
-
-                case MIDGARD_CONFIG_BLOBDIR:
-                        g_value_set_string (value, self->blobdir);
-                        break;
-
-                case MIDGARD_CONFIG_LOGFILENAME:
-                        g_value_set_string (value, self->logfilename);
-                        break;
-
-                case MIDGARD_CONFIG_SCHEMADIR:
-                        g_value_set_string (value, self->schemadir);
-                        break;
-
@@ -1571 +1638 @@
-                        g_value_set_string(value, self->pamfile);
-                        break;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                default:
-                        G_OBJECT_WARN_INVALID_PROPERTY_ID(object,property_id,pspec);
@@ -1647 +1731 @@
-                        MIDGARD_CONFIG_DBPASS,
-                        pspec);
-
-        pspec = g_param_spec_string ("blobdir",
-                        "Blobdir",
-                        "Location of the blobs directory",
-                        "",
-                        G_PARAM_READWRITE);
-        g_object_class_install_property (gobject_class,
-                        MIDGARD_CONFIG_BLOBDIR,
-                        pspec);
-        
-        pspec = g_param_spec_string ("logfilename",
@@ -1666 +1741 @@
-                        pspec);
-
-        pspec = g_param_spec_string ("schemadir",
-                        "SchemaDir",  
-                        "Location of the schema file",
-                        "",
-                        G_PARAM_READWRITE);
-        g_object_class_install_property (gobject_class,
-                        MIDGARD_CONFIG_SCHEMADIR,
-                        pspec);
-
-        pspec = g_param_spec_string ("defaultlang",
-                        "DefaultLanguage",  
@@ -1750 +1816 @@
-        g_object_class_install_property (gobject_class,
-                        MIDGARD_CONFIG_AUTHTYPE,
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

branches/vinland/core/midgard/src/midgard_config.h

@@ -58 +58 @@
-        GObject parent;
-        
+        /* MidgardDatabase */
-        gchar *dbtype;
-        gchar *host;
@@ -64 +65 @@
-        gchar *dbuser;
-        gchar *dbpass;
-        gchar *blobdir;
-        gchar *logfilename;
-        gchar *schemadir;
@@ -80 +80 @@
-        gchar *pamfile;
-        gboolean gdathreads;
+
+        /* MidgardDir */
+        gchar *blobdir;
+        gchar *sharedir;
+        gchar *vardir;
+        gchar *cachedir;
-
-        /* < private > */

branches/vinland/core/midgard/src/midgard_connection.c

@@ -324 +324 @@
-                        if(self->priv->cache->lang_ids)
-                                id_list_free(self->priv->cache->lang_ids);
-
-                        if(self->priv->configname) {
-                                g_free(self->priv->configname);
-                                self->priv->configname = NULL;
-                        }
-
-                        g_free(self->priv->cache);
@@ -948 +943 @@
-                        
-                        MidgardSchema *schema = g_object_new(MIDGARD_TYPE_SCHEMA, NULL);
-
+
+
+
-                        midgard_schema_read_dir(schema, config->schemadir);
-                        
@@ -972 +969 @@
-        }
-        
-        mgd->priv->configname = g_strdup(mgd->priv->config->priv->configname);
-        return TRUE;
-}
@@ -1824 +1820 @@
-        *n_objects = i;
-
-
+(const GObject**) 
-}
-
@@ -1878 +1874 @@
-
-        new_mgd->priv->config = conn->priv->config;
-        new_mgd->priv->configname = conn->priv->configname;
-        new_mgd->priv->loghandler = 0;
-        new_mgd->priv->loglevel = conn->priv->loglevel;

branches/vinland/core/midgard/src/midgard_core_config.h

@@ -29 +29 @@
-        gchar *blobdir;
-        gchar *sharedir;
+        gchar *vardir;
+        gchar *cachedir;
-}mdirs;
-
-/* a cached version of paths */
-
-
-
-
-
-
+
+
+
-
-#endif /* MIDGARD_CORE_CONFIG_H */

branches/vinland/core/midgard/src/midgard_dbus.c

@@ -110 +110 @@
-        }
-
-        if(!mgd->priv->configname) {
-                g_warning("No configuration associated with Midgard connection");
-                return NULL;
-        }
-
-        gchar *sg_guid = NULL;
-        const GObject *sg = mgd->priv->current_sitegroup;
@@ -125 +120 @@
-                        sg_guid = midgard_uuid_new();
-                }
+
-        } else {
-                

branches/vinland/core/midgard/src/midgard_schema.h

@@ -104 +104 @@
- * internal schema structures allocated for this object instance.
- */
-
+, const gchar *path
-
-/**

branches/vinland/core/midgard/src/midgard_utils.h

@@ -24 +24 @@
-const char *midgard_version();
-void midgard_init();
+void midgard_close();
-
-#endif /* _MIDGARD_UTIL_H_ */

branches/vinland/core/midgard/test/midgard-schema.c

@@ -17 +17 @@
- */
-
-#include <libgda/libgda.h>
-#include "src/midgard_error.h"
-#include "src/midgard_object_class.h"
@@ -145 +144 @@
-        gchar **args = { NULL };
-
-
-
-
-
-
+
-
-        MidgardConnection *mgd = midgard_connection_new();
@@ -257 +252 @@
-        g_free(mgdpassword);
-        g_object_unref(mgd);
+
+        midgard_close();
+
-        return 0;
-}