diff --git a/build b/build index d8263ee..e440e5c 100644 --- a/build +++ b/build @@ -1 +1 @@ -2 \ No newline at end of file +3 \ No newline at end of file diff --git a/src/framework/MicroService.h b/src/framework/MicroService.h index 1fe7b72..795d5bb 100644 --- a/src/framework/MicroService.h +++ b/src/framework/MicroService.h @@ -3231,22 +3231,25 @@ namespace OpenWifi { "%Y-%m-%d %H:%M:%S %s: [%p] %t"); if (LoggingDestination == "console") { Poco::AutoPtr Console(new Poco::ConsoleChannel); + Poco::AutoPtr Async(new Poco::AsyncChannel(Console)); Poco::AutoPtr Formatter(new Poco::PatternFormatter); Formatter->setProperty("pattern", LoggingFormat); Poco::AutoPtr FormattingChannel( - new Poco::FormattingChannel(Formatter, Console)); + new Poco::FormattingChannel(Formatter, Async)); Poco::Logger::root().setChannel(FormattingChannel); } else if (LoggingDestination == "colorconsole") { Poco::AutoPtr Console(new Poco::ColorConsoleChannel); + Poco::AutoPtr Async(new Poco::AsyncChannel(Console)); Poco::AutoPtr Formatter(new Poco::PatternFormatter); Formatter->setProperty("pattern", LoggingFormat); Poco::AutoPtr FormattingChannel( - new Poco::FormattingChannel(Formatter, Console)); + new Poco::FormattingChannel(Formatter, Async)); Poco::Logger::root().setChannel(FormattingChannel); } else if (LoggingDestination == "sql") { + //"CREATE TABLE T_POCO_LOG (Source VARCHAR, Name VARCHAR, ProcessId INTEGER, Thread VARCHAR, ThreadId INTEGER, Priority INTEGER, Text VARCHAR, DateTime DATE)" } else if (LoggingDestination == "syslog") { - //"CREATE TABLE T_POCO_LOG (Source VARCHAR, Name VARCHAR, ProcessId INTEGER, Thread VARCHAR, ThreadId INTEGER, Priority INTEGER, Text VARCHAR, DateTime DATE)" + } else { auto LoggingLocation = MicroService::instance().ConfigPath("logging.path", "$OWCERT_ROOT/logs") + "/log"; @@ -3255,10 +3258,11 @@ namespace OpenWifi { FileChannel->setProperty("rotation", "10 M"); FileChannel->setProperty("archive", "timestamp"); FileChannel->setProperty("path", LoggingLocation); + Poco::AutoPtr Async(new Poco::AsyncChannel(FileChannel)); Poco::AutoPtr Formatter(new Poco::PatternFormatter); Formatter->setProperty("pattern", LoggingFormat); Poco::AutoPtr FormattingChannel( - new Poco::FormattingChannel(Formatter, FileChannel)); + new Poco::FormattingChannel(Formatter, Async)); Poco::Logger::root().setChannel(FormattingChannel); } auto Level = Poco::Logger::parseLevel(MicroService::instance().ConfigGetString("logging.level", "debug")); @@ -3295,8 +3299,6 @@ namespace OpenWifi { if(WWWAssetsDir_.empty()) WWWAssetsDir_ = DataDir_; - - LoadMyConfig(); InitializeSubSystemServers(); diff --git a/src/framework/RESTAPI_errors.h b/src/framework/RESTAPI_errors.h index 9121077..6e0fa97 100644 --- a/src/framework/RESTAPI_errors.h +++ b/src/framework/RESTAPI_errors.h @@ -63,5 +63,6 @@ namespace OpenWifi::RESTAPI::Errors { static const std::string AuthenticatorVerificationIncomplete{"Authenticator validation is not complete."}; static const std::string SMSCouldNotBeSentRetry{"SMS could not be sent to validate device, try later or change the phone number."}; static const std::string SMSCouldNotValidate{"Code and number could not be validated"}; + static const std::string InvalidDeviceClass{"Invalid device class. Must be: any, venue, entity, or subscriber"}; } diff --git a/src/framework/StorageClass.h b/src/framework/StorageClass.h index dc705d2..78e6050 100644 --- a/src/framework/StorageClass.h +++ b/src/framework/StorageClass.h @@ -33,7 +33,7 @@ namespace OpenWifi { int Start() override { std::lock_guard Guard(Mutex_); - Logger().setLevel(Poco::Message::PRIO_NOTICE); + Logger().setLevel(Poco::Message::PRIO_INFORMATION); Logger().notice("Starting."); std::string DBType = MicroService::instance().ConfigGetString("storage.type");