Skip to content

Bump body-parser from 1.20.3 to 1.20.6 in /supplement/nodejs #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dependabot wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bump body-parser from 1.20.3 to 1.20.6 in /supplement/nodejs #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e04c82f
Bump body-parser from 1.20.3 to 1.20.6 in /supplement/nodejs
dependabot[bot] Jul 23, 2026
201f92c
refactor(logging): remove legacy logging macros
VolkerChristian Aug 31, 2026
f1202b2
Merge pull request #252 from SNodeC/codex/semantic-logging-cleanup-de…
VolkerChristian Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 90 additions & 76 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,9 @@ install(
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/snodec
COMPONENT "core"
)

install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/SemanticLog.h"
DESTINATION include/snode.c
COMPONENT "logger"
)
10 changes: 5 additions & 5 deletions src/express/express-compat-suite/snodec/0001-add-express-compat-server.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ new file mode 100644
+#include "express/Response.h"
+#include "express/Router.h"
+#include "express/legacy/in/WebApp.h"
+#include "log/Logger.h"
+#include "SemanticLog.h"
+
+#include <nlohmann/json.hpp>
+
Expand Down Expand Up @@ -263,16 +263,16 @@ new file mode 100644
+ [](const express::legacy::in::WebApp::SocketAddress& socketAddress, const core::socket::State& state) {
+ switch (state) {
+ case core::socket::State::OK:
+ VLOG(1) << "express-compat listening on '" << socketAddress.toString() << "'";
+ snode::semantic::appLog().info() << "express-compat listening on '" << socketAddress.toString() << "'";
+ break;
+ case core::socket::State::DISABLED:
+ VLOG(1) << "express-compat disabled";
+ snode::semantic::appLog().info() << "express-compat disabled";
+ break;
+ case core::socket::State::ERROR:
+ LOG(ERROR) << "express-compat " << socketAddress.toString() << ": " << state.what();
+ snode::semantic::appLog().error() << "express-compat " << socketAddress.toString() << ": " << state.what();
+ break;
+ case core::socket::State::FATAL:
+ LOG(FATAL) << "express-compat " << socketAddress.toString() << ": " << state.what();
+ snode::semantic::appLog().critical() << "express-compat " << socketAddress.toString() << ": " << state.what();
+ break;
+ }
+ });
Expand Down
19 changes: 0 additions & 19 deletions src/log/Logger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
#include "log/SemanticLogger.h"
#include "log/detail/SpdlogBackend.h"

#include <cerrno>
#include <utility>

#endif /* DOXYGEN_SHOULD_SKIP_THIS */
Expand Down Expand Up @@ -127,24 +126,6 @@ namespace logger {

bool Logger::disableColorLog = false;

LogMessage::LogMessage(const Level level, const int verboseLevel, const bool withErrno)
: level(level)
, verboseLevel(verboseLevel)
, withErrno(withErrno)
, enabled(true)
, errnoValue(errno) {
}

LogMessage::~LogMessage() {
if (enabled) {
backend.emitLegacy(level, message.str(), withErrno, errnoValue);
}
}

std::ostringstream& LogMessage::stream() {
return message;
}

} // namespace logger

std::ostream& Color::operator<<(std::ostream& os, const Code& code) {
Expand Down
49 changes: 0 additions & 49 deletions src/log/Logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
#include <functional>
#include <memory>
#include <ostream> // IWYU pragma: export
#include <sstream>
#include <string>

#endif /* DOXYGEN_SHOULD_SKIP_THIS */
Expand Down Expand Up @@ -122,54 +121,6 @@ namespace logger {
friend std::string Color::operator+(const Color::Code& code, const std::string& string);
};

class LogMessage {
public:
LogMessage(Level level, int verboseLevel = -1, bool withErrno = false);
~LogMessage();

std::ostringstream& stream();

private:
Level level;
int verboseLevel;
bool withErrno;
bool enabled;
int errnoValue;
std::ostringstream message;
};

} // namespace logger

#ifdef SNODEC_DISABLE_LOGLEVEL_LOGGING
#define LOG(level) \
if (true) { \
} else \
::logger::LogMessage(::logger::Level::level).stream()
#define PLOG(level) \
if (true) { \
} else \
::logger::LogMessage(::logger::Level::level, -1, true).stream()
#else
#define LOG(level) \
if (!::logger::Logger::shouldLog(::logger::Level::level)) { \
} else \
::logger::LogMessage(::logger::Level::level).stream()
#define PLOG(level) \
if (!::logger::Logger::shouldLog(::logger::Level::level)) { \
} else \
::logger::LogMessage(::logger::Level::level, -1, true).stream()
#endif

#ifdef SNODEC_DISABLE_VERBOSE_LOGGING
#define VLOG(level) \
if (true) { \
} else \
::logger::LogMessage(::logger::Level::VERBOSE, level).stream()
#else
#define VLOG(level) \
if (!::logger::Logger::shouldVerbose(level)) { \
} else \
::logger::LogMessage(::logger::Level::VERBOSE, level).stream()
#endif

#endif // LOGGER_LOGGER_H
Loading
Loading