From ca73aa43ae13d3642f180d5d2e0c28d938c6ee48 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik@fiktivkod.org>
Date: Sun, 6 Feb 2011 19:26:12 +0100
Subject: [PATCH] config: move log settings to its own section.

---
 config.ini-sample |  9 +++++----
 docs/config.txt   | 10 +++++-----
 src/archived.c    | 10 +++++-----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/config.ini-sample b/config.ini-sample
index bb67367..4206195 100644
--- a/config.ini-sample
+++ b/config.ini-sample
@@ -1,7 +1,8 @@
-[general]
-    uselog = 0
-    loglevel = INFO, WARNING, CRITCAL
-    logdir = logs
+
+[log]
+    use = 0
+    level = INFO, WARNING, CRITCAL
+    directory = logs
 
 [mysql]
 	host = localhost
diff --git a/docs/config.txt b/docs/config.txt
index 349bef0..c88aee9 100644
--- a/docs/config.txt
+++ b/docs/config.txt
@@ -17,20 +17,20 @@ String ;;
 Options
 ~~~~~~
 
-General
+Log
 ^^^^^^
-Options available in the general section
+Options available in the log section
 
-uselog (Boolean);;
+use (Boolean);;
     Turn logging on/off (values are: Y, N, T, F, 1, 0)
-loglevel (String List);;
+level (String List);;
     Set the logging level
     Options available are: DEBUG, INFO, WARNING, CRITCAL, ALL
 +
 NOTE: A comma separated list can be used to specify more than one level.
 +
 
-logdir (String);;
+directory (String);;
     Specify a logging directory
 
 
diff --git a/src/archived.c b/src/archived.c
index 9b06139..6a75265 100644
--- a/src/archived.c
+++ b/src/archived.c
@@ -140,9 +140,9 @@ int main(int argc, char **argv) {
 #ifdef __DEBUG__
     init_log(LOG_ALL, NULL);
 #else
-    if (iniparser_getboolean(config, "general:uselog", 0)) {
-        char *strlevel = iniparser_getstring(config, "general:loglevel", NULL);
-        char *path = iniparser_getstring(config, "general:logdir", NULL);
+    if (iniparser_getboolean(config, "log:use", 0)) {
+        char *strlevel = iniparser_getstring(config, "log:level", NULL);
+        char *path = iniparser_getstring(config, "log:directory", NULL);
         unsigned level = 0;
 
         if (strlevel) {
@@ -157,13 +157,13 @@ int main(int argc, char **argv) {
                 strbuf_trim(*ptr);
                 l = logstrtolvl((*ptr)->buf);
                 if (l == 0)
-                    die("config (general:loglevel): unknown log level: %s\n", (*ptr)->buf);
+                    die("config (log:level): unknown level: %s\n", (*ptr)->buf);
                 level += l;
             }
             strbuf_free_list(list);
             strbuf_free(&sb);
         } else {
-            die("config (general:loglevel): no levels defined\n");
+            die("config (log:level): no levels defined\n");
         }
         
         init_log(level, path);