core,data: Don't change log level config options

diff --git a/data/rygel.conf b/data/rygel.conf
index dcfd415..c6e2995 100644 (file)
--- a/data/rygel.conf
+++ b/data/rygel.conf
@@ -42,7 +42,7 @@ port=0
 # 3=warning
 # 4=message/info
 # 5=debug
-log-levels=*:4
+log-level=*:4
 
 # Allow upload of media files?
 allow-upload=true

diff --git a/src/rygel/rygel-cmdline-config.vala b/src/rygel/rygel-cmdline-config.vala
index 53643a5..71b9819 100644 (file)
--- a/src/rygel/rygel-cmdline-config.vala
+++ b/src/rygel/rygel-cmdline-config.vala
@@ -87,7 +87,7 @@ internal class Rygel.CmdlineConfig : GLib.Object, Configuration {
           ref disallow_upload, "Disallow upload", null },
         { "disallow-deletion", 'D', 0, OptionArg.NONE,
           ref disallow_deletion, "Disallow deletion", null },
-        { "log-levels", 'g', 0, OptionArg.STRING, ref log_levels,
+        { "log-level", 'g', 0, OptionArg.STRING, ref log_levels,
           "Comma-separated list of domain:level pairs to specify log level " +
           "thresholds for individual domains. domain could be either " +
           "'rygel', name of a plugin or '*' for all domains. " +

diff --git a/src/rygel/rygel-user-config.vala b/src/rygel/rygel-user-config.vala
index 3356d80..f11c043 100644 (file)
--- a/src/rygel/rygel-user-config.vala
+++ b/src/rygel/rygel-user-config.vala
@@ -40,7 +40,7 @@ public class Rygel.UserConfig : GLib.Object, Configuration {
     public static const string WMV_TRANSCODER_KEY = "enable-wmv-transcoder";
     public static const string ALLOW_UPLOAD_KEY = "allow-upload";
     public static const string ALLOW_DELETION_KEY = "allow-deletion";
-    public static const string LOG_LEVELS_KEY = "log-levels";
+    public static const string LOG_LEVELS_KEY = "log-level";
     public static const string PLUGIN_PATH_KEY = "plugin-path";
 
     // Our singleton