andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 16:59:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix syslog starting

Browse Source
This commit is contained in:
Proddy
2023-01-23 23:20:27 +01:00
parent 15760117ee
commit 17c7ae7d7c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/system.cpp
View File

@@ -244,15 +244,15 @@ void System::syslog_init() {
syslog_port_ = settings.syslog_port; syslog_port_ = settings.syslog_port;
}); });
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
if (!syslog_.started()) { if (syslog_enabled_) {
// start & configure syslog // start & configure syslog
// if (!was_enabled) { if (!was_enabled) {
if (!syslog_.started()) {
syslog_.start(); syslog_.start();
EMSESP::logger().info("Starting Syslog"); EMSESP::logger().info("Starting Syslog");
} }
syslog_.log_level((uuid::log::Level)syslog_level_); syslog_.log_level((uuid::log::Level)syslog_level_);
syslog_.mark_interval(syslog_mark_interval_); syslog_.mark_interval(syslog_mark_interval_);
syslog_.hostname(hostname().c_str());
IPAddress addr; IPAddress addr;
if (!addr.fromString(syslog_host_.c_str())) { if (!addr.fromString(syslog_host_.c_str())) {
@@ -260,8 +260,6 @@ void System::syslog_init() {
} }
syslog_.destination(addr, syslog_port_); syslog_.destination(addr, syslog_port_);
syslog_.hostname(hostname().c_str());
// register the command // register the command
// Command::add(EMSdevice::DeviceType::SYSTEM, F_(syslog), System::command_syslog_level, FL_(changeloglevel_cmd), CommandFlag::ADMIN_ONLY); // Command::add(EMSdevice::DeviceType::SYSTEM, F_(syslog), System::command_syslog_level, FL_(changeloglevel_cmd), CommandFlag::ADMIN_ONLY);
@@ -1054,6 +1052,7 @@ bool System::check_upgrade(bool factory_settings) {
version::Semver200_version settings_version(settingsVersion); version::Semver200_version settings_version(settingsVersion);
#if defined(EMSESP_DEBUG)
if (!missing_version) { if (!missing_version) {
LOG_INFO("Current version from settings is %d.%d.%d-%s", LOG_INFO("Current version from settings is %d.%d.%d-%s",
settings_version.major(), settings_version.major(),
@@ -1061,6 +1060,7 @@ bool System::check_upgrade(bool factory_settings) {
settings_version.patch(), settings_version.patch(),
settings_version.prerelease().c_str()); settings_version.prerelease().c_str());
} }
#endif
// always save the new version to the settings // always save the new version to the settings
EMSESP::webSettingsService.update( EMSESP::webSettingsService.update(