Changed error messages for calls to `mkdir': Report creation of which directory failed

Fixed small but in the call to `plugin_load': We need the `value', not the `key'..

diff --git a/src/collectd.c b/src/collectd.c
index 348623c091499f9fb46d8c42ced47d2bae3b7cf1..ca7edb5408478bf8641b7110032d76f6fe30fee0 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -70,12 +70,12 @@ int change_basedir (char *dir)
                {
                        if (mkdir (dir, 0755) == -1)
                        {
-                               syslog (LOG_ERR, "mkdir: %s", strerror (errno));
+                               syslog (LOG_ERR, "mkdir (%s): %s", dir, strerror (errno));
                                return (-1);
                        }
                        else if (chdir (dir) == -1)
                        {
-                               syslog (LOG_ERR, "chdir: %s", strerror (errno));
+                               syslog (LOG_ERR, "chdir (%s): %s", dir, strerror (errno));
                                return (-1);
                        }
                }

diff --git a/src/common.c b/src/common.c
index d946cfb41062157bf1eeac1060a2631e45b2af72..1eec286a54d27c4b1731a80082912704e61dde10 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -105,13 +105,13 @@ int check_create_dir (char *dir)
                {
                        if (mkdir (dir, 0755) == -1)
                        {
-                               syslog (LOG_ERR, "mkdir %s: %s", dir, strerror (errno));
+                               syslog (LOG_ERR, "mkdir (%s): %s", dir, strerror (errno));
                                return (-1);
                        }
                }
                else
                {
-                       syslog (LOG_ERR, "stat %s: %s", dir, strerror (errno));
+                       syslog (LOG_ERR, "stat (%s): %s", dir, strerror (errno));
                        return (-1);
                }
        }

diff --git a/src/configfile.c b/src/configfile.c
index 0d1569f9d0c83af6c0313e9c657c5b1cf7207fe7..5cdd736065b262385aab98d170a323fcddd15875 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -321,7 +321,7 @@ int cf_callback_loadmodule (const char *shortvar, const char *var,
                return (LC_CBRET_ERROR);
        }
 
-       if (plugin_load (shortvar))
+       if (plugin_load (value))
                syslog (LOG_ERR, "plugin_load (%s): failed to load plugin", shortvar);
 
        /* Return `okay' even if there was an error, because it's not a syntax