ordered loglevel

changed loglevel 0, new loglevels 1 and 3
volkszaehler · Feb 13, 2017 · 70d7362 · 70d7362
1 parent 736d14d
commit 70d7362
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/etc/vzlogger.conf b/etc/vzlogger.conf
@@ -13,7 +13,7 @@
 {
     // General settings
     "daemon": false,        // run periodically
-    "verbosity": 5,         // log verbosity (0=log_error and log_warning, 5=log_info, 10=log_debug, 15=log_finest)
+    "verbosity": 5,         // log verbosity (0=log_none, 1=log_error, 3=log_warning, 5=log_info, 10=log_debug, 15=log_finest)
     "log": "/tmp/vzlogger.log", // log file, optional
     "retry": 30,            // http retry delay in seconds
 

diff --git a/etc/vzlogger_generic.schema.json b/etc/vzlogger_generic.schema.json
@@ -893,9 +893,9 @@
         "verbosity": {
             "id": "/verbosity",
             "type": "integer",
-            "enum": [0, 5, 10, 15],
-            "default": 0,
-            "description": "depth of loging. 0 = log_error or log-warning, 5 = log_info, 10 = log-debug, 15 = log_finest"
+            "enum": [0, 1, 3, 5, 10, 15],
+            "default": 1,
+            "description": "depth of loging. 0=log_none, 1=log_error, 3=log-warning, 5=log_info, 10=log-debug, 15=log_finest"
         },
         "log": {
             "id": "/log",

diff --git a/include/common.h b/include/common.h
@@ -18,8 +18,9 @@
 
 /* enumerations */
 typedef enum {
-	log_error = -1,
-	log_warning = 0,
+    log_none = 0,
+	log_error = 1,
+	log_warning = 3,
 	log_info = 5,
 	log_debug = 10,
 	log_finest = 15

diff --git a/src/vzlogger.cpp b/src/vzlogger.cpp
@@ -369,8 +369,8 @@ int main(int argc, char *argv[]) {
 		return EXIT_FAILURE;
 	}
 
-	// always (that's why log_error is used) print version info to log file:
-	print(log_error, "vzlogger v%s based on %s from %s started.", "main",
+	// always (that's why log_none is used) print version info to log file:
+	print(log_none, "vzlogger v%s based on %s from %s started.", "main",
 		  VERSION, g_GIT_SHALONG, g_GIT_LAST_COMMIT_DATE);
 
 	//mappings = (MapContainer::Ptr)(new MapContainer());