From 87d22b1e1602fb47541227ce8786b47bbbbe5c90 Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Thu, 21 Mar 2024 23:40:44 +0100 Subject: [PATCH] apps: set app log level by command line parameter. --- apps/aqhome-data/init.c | 19 +++++++++++++++++++ apps/aqhome-data/main.c | 3 +-- apps/aqhome-mqttlog/init.c | 19 +++++++++++++++++++ apps/aqhome-mqttlog/main.c | 1 - apps/aqhome-nodes/init.c | 19 +++++++++++++++++++ apps/aqhome-nodes/main.c | 3 +-- apps/aqhome-react/init.c | 19 +++++++++++++++++++ apps/aqhome-react/main.c | 3 +-- 8 files changed, 79 insertions(+), 7 deletions(-) diff --git a/apps/aqhome-data/init.c b/apps/aqhome-data/init.c index 7b21063..dd98631 100644 --- a/apps/aqhome-data/init.c +++ b/apps/aqhome-data/init.c @@ -88,6 +88,14 @@ int AqHomeData_Init(AQHOME_DATA *aqh, int argc, char **argv) aqh->dbArgs=dbArgs; + s=GWEN_DB_GetCharValue(dbArgs, "loglevel", 0, NULL); + if (s && *s) { + GWEN_LOGGER_LEVEL ll; + + ll=GWEN_Logger_Name2Level(s); + GWEN_Logger_SetLevel(NULL, ll); + } + aqh->timeout=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 0); s=GWEN_DB_GetCharValue(dbArgs, "pidfile", 0, AQHOME_DATA_DEFAULT_PIDFILE); @@ -224,6 +232,17 @@ int _readArgs(int argc, char **argv, GWEN_DB_NODE *dbArgs) { int rv; const GWEN_ARGS args[]= { + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "loglevel", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "L", /* short option */ + "loglevel", /* long option */ + I18S("Specify loglevel"), /* short description */ + I18S("Specify loglevel") /* long description */ + }, { GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ GWEN_ArgsType_Char, /* type */ diff --git a/apps/aqhome-data/main.c b/apps/aqhome-data/main.c index 156949d..e3cb9c1 100644 --- a/apps/aqhome-data/main.c +++ b/apps/aqhome-data/main.c @@ -94,8 +94,7 @@ int main(int argc, char **argv) } GWEN_Logger_Open(0, "aqhome-data", 0, GWEN_LoggerType_Console, GWEN_LoggerFacility_User); - //GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Warning); - GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Info); + GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Warning); rv=_setSignalHandlers(); if (rv<0) { diff --git a/apps/aqhome-mqttlog/init.c b/apps/aqhome-mqttlog/init.c index 36a72cf..f91b77d 100644 --- a/apps/aqhome-mqttlog/init.c +++ b/apps/aqhome-mqttlog/init.c @@ -76,6 +76,14 @@ int AqHomeMqtt_Init(AQHOME_MQTT *aqh, int argc, char **argv) AQH_MergeConfigFileIntoConfig(dbArgs, "ConfigFile"); aqh->dbArgs=dbArgs; + s=GWEN_DB_GetCharValue(dbArgs, "loglevel", 0, NULL); + if (s && *s) { + GWEN_LOGGER_LEVEL ll; + + ll=GWEN_Logger_Name2Level(s); + GWEN_Logger_SetLevel(NULL, ll); + } + aqh->timeout=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 0); s=GWEN_DB_GetCharValue(dbArgs, "pidfile", 0, AQHOME_MQTT_DEFAULT_PIDFILE); @@ -289,6 +297,17 @@ int _readArgs(int argc, char **argv, GWEN_DB_NODE *dbArgs) { int rv; const GWEN_ARGS args[]= { + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "loglevel", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "L", /* short option */ + "loglevel", /* long option */ + I18S("Specify loglevel"), /* short description */ + I18S("Specify loglevel") /* long description */ + }, { GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ GWEN_ArgsType_Char, /* type */ diff --git a/apps/aqhome-mqttlog/main.c b/apps/aqhome-mqttlog/main.c index f0360b4..9e3c5d3 100644 --- a/apps/aqhome-mqttlog/main.c +++ b/apps/aqhome-mqttlog/main.c @@ -100,7 +100,6 @@ int main(int argc, char **argv) GWEN_Logger_Open(0, "aqhome-mqttlog", 0, GWEN_LoggerType_Console, GWEN_LoggerFacility_User); GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Warning); - //GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Info); rv=AQH_Init(); if (rv<0) { diff --git a/apps/aqhome-nodes/init.c b/apps/aqhome-nodes/init.c index 827843b..9ca74da 100644 --- a/apps/aqhome-nodes/init.c +++ b/apps/aqhome-nodes/init.c @@ -91,6 +91,14 @@ int AqHomed_Init(AQHOMED *aqh, int argc, char **argv) AQH_MergeConfigFileIntoConfig(dbArgs, "ConfigFile"); aqh->dbArgs=dbArgs; + s=GWEN_DB_GetCharValue(dbArgs, "loglevel", 0, NULL); + if (s && *s) { + GWEN_LOGGER_LEVEL ll; + + ll=GWEN_Logger_Name2Level(s); + GWEN_Logger_SetLevel(NULL, ll); + } + s=GWEN_DB_GetCharValue(dbArgs, "pidfile", 0, AQHOMED_DEFAULT_PIDFILE); if (s && *s) { AqHomed_SetPidFile(aqh, s); @@ -300,6 +308,17 @@ int _readArgs(int argc, char **argv, GWEN_DB_NODE *dbArgs) { int rv; const GWEN_ARGS args[]= { + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "loglevel", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "L", /* short option */ + "loglevel", /* long option */ + I18S("Specify loglevel"), /* short description */ + I18S("Specify loglevel") /* long description */ + }, { GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ GWEN_ArgsType_Char, /* type */ diff --git a/apps/aqhome-nodes/main.c b/apps/aqhome-nodes/main.c index 74ab103..aeb69af 100644 --- a/apps/aqhome-nodes/main.c +++ b/apps/aqhome-nodes/main.c @@ -84,8 +84,7 @@ int main(int argc, char **argv) } GWEN_Logger_Open(0, "aqhomed", 0, GWEN_LoggerType_Console, GWEN_LoggerFacility_User); - //GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Warning); - GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Info); + GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Warning); rv=_setSignalHandlers(); if (rv<0) { diff --git a/apps/aqhome-react/init.c b/apps/aqhome-react/init.c index c3d2c1b..8fb40fd 100644 --- a/apps/aqhome-react/init.c +++ b/apps/aqhome-react/init.c @@ -75,6 +75,14 @@ int AqHomeReact_Init(AQHOME_REACT *aqh, int argc, char **argv) AQH_MergeConfigFileIntoConfig(dbArgs, "ConfigFile"); aqh->dbArgs=dbArgs; + s=GWEN_DB_GetCharValue(dbArgs, "loglevel", 0, NULL); + if (s && *s) { + GWEN_LOGGER_LEVEL ll; + + ll=GWEN_Logger_Name2Level(s); + GWEN_Logger_SetLevel(NULL, ll); + } + aqh->timeout=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 0); s=GWEN_DB_GetCharValue(dbArgs, "pidfile", 0, AQHOME_REACT_DEFAULT_PIDFILE); @@ -198,6 +206,17 @@ int _readArgs(int argc, char **argv, GWEN_DB_NODE *dbArgs) { int rv; const GWEN_ARGS args[]= { + { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ + GWEN_ArgsType_Char, /* type */ + "loglevel", /* name */ + 0, /* minnum */ + 1, /* maxnum */ + "L", /* short option */ + "loglevel", /* long option */ + I18S("Specify loglevel"), /* short description */ + I18S("Specify loglevel") /* long description */ + }, { GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ GWEN_ArgsType_Char, /* type */ diff --git a/apps/aqhome-react/main.c b/apps/aqhome-react/main.c index 6180be8..327318c 100644 --- a/apps/aqhome-react/main.c +++ b/apps/aqhome-react/main.c @@ -96,8 +96,7 @@ int main(int argc, char **argv) } GWEN_Logger_Open(0, "aqhome-react", 0, GWEN_LoggerType_Console, GWEN_LoggerFacility_User); - //GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Warning); - GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Info); + GWEN_Logger_SetLevel(0, GWEN_LoggerLevel_Warning); rv=AQH_Init(); if (rv<0) {